fix

sanja-byelkin · sanja-byelkin · commit 86e849d9cc98 · 2026-05-07T09:23:06.000+02:00
diff --git a/client/mysql.cc b/client/mysql.cc
@@ -1427,7 +1427,7 @@ int main(int argc,char *argv[])
     else if ((home= getenv("HOME")))
     {
       size_t histfile_size=
-        strlen(getenv(home)) + strlen("/.mysql_history") + 2;
+        strlen(home) + strlen("/.mysql_history") + 2;
       histfile=(char*) my_malloc(PSI_NOT_INSTRUMENTED,
             histfile_size, MYF(MY_WME));
       if (histfile)
diff --git a/debian/mariadb-test-data.install b/debian/mariadb-test-data.install
@@ -1,4 +1,4 @@
-usr/lib/mariadb/plugin/test_pam_modules
+usr/lib/mysql/plugin/test_pam_modules
 usr/share/mariadb/mariadb-test/collections
 usr/share/mariadb/mariadb-test/include
 usr/share/mariadb/mariadb-test/main
diff --git a/mysql-test/suite/s3/debug.result b/mysql-test/suite/s3/debug.result
@@ -24,9 +24,9 @@ select count(*) from t1;
 count(*)
 100
 set @@global.s3_debug=0;
-FOUND 8 /s3_test_/ in mysqld.1.err
+FOUND 10 /s3_test_/ in mysqld.1.err
 select count(*) from t1;
 count(*)
 100
 drop table t1;
-FOUND 8 /s3_test_/ in mysqld.1.err
+FOUND 10 /s3_test_/ in mysqld.1.err

Original file line number	Diff line number	Diff line change
`@@ -1427,7 +1427,7 @@ int main(int argc,char *argv[])`
`1427`	`1427`	`else if ((home= getenv("HOME")))`
`1428`	`1428`	`{`
`1429`	`1429`	`size_t histfile_size=`
`1430`		`- strlen(getenv(home)) + strlen("/.mysql_history") + 2;`
	`1430`	`+ strlen(home) + strlen("/.mysql_history") + 2;`
`1431`	`1431`	`histfile=(char*) my_malloc(PSI_NOT_INSTRUMENTED,`
`1432`	`1432`	`histfile_size, MYF(MY_WME));`
`1433`	`1433`	`if (histfile)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-usr/lib/mariadb/plugin/test_pam_modules`
	`1`	`+usr/lib/mysql/plugin/test_pam_modules`
`2`	`2`	`usr/share/mariadb/mariadb-test/collections`
`3`	`3`	`usr/share/mariadb/mariadb-test/include`
`4`	`4`	`usr/share/mariadb/mariadb-test/main`