Merge tag '11.4' into 11.6

MariaDB 11.4.4 release

mysql-test/suite/plugins/r/audit_null.result

@@ -7,7 +7,7 @@ select 1;
 1
 1
 select foobar;
-ERROR 42S22: Unknown column 'foobar' in 'field list'
+ERROR 42S22: Unknown column 'foobar' in 'SELECT'
 show status like 'audit_null%';
 Variable_name	Value
 Audit_null_called	9

mysql-test/suite/plugins/r/compression,mroonga-lz4.rdiff

@@ -1,6 +1,6 @@
 --- suite/plugins/r/compression.result
 +++ suite/plugins/r/compression.reject
-@@ -1,13 +1,8 @@
+@@ -1,14 +1,8 @@
  #
 -# Testing bzip2 compression provider with innodb
 +# Testing lz4 compression provider with mroonga
@@ -10,13 +10,14 @@
 -call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
 -call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
 -call mtr.add_suppression("Table `test`.`t1` is corrupted. Please drop the table and recreate");
+-call mtr.add_suppression("InnoDB: File '.*test/t1\\.ibd' is corrupted");
 -call mtr.add_suppression("Table .*t1.* is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
 -create table t1 (a int, b text ) engine = innodb page_compressed = 1;
 +create table t1 (a int, b text COMMENT 'FLAGS "COLUMN_SCALAR|COMPRESS_LZ4"') engine = mroonga charset = utf8;
  insert t1 (a, b) values (0, repeat("abc", 100));
  insert t1 (a, b) values (1, repeat("def", 1000));
  insert t1 (a, b) values (2, repeat("ghi", 10000));
-@@ -16,12 +11,20 @@
+@@ -17,12 +11,20 @@
  0	abcabcabc	300
  1	defdefdef	3000
  2	ghighighi	30000

mysql-test/suite/plugins/r/compression.result

@@ -6,6 +6,7 @@ set global innodb_compression_algorithm = bzip2;
 call mtr.add_suppression("Background Page read failed to read, uncompress, or decrypt");
 call mtr.add_suppression("Table is compressed or encrypted but uncompress or decrypt failed");
 call mtr.add_suppression("Table `test`.`t1` is corrupted. Please drop the table and recreate");
+call mtr.add_suppression("InnoDB: File '.*test/t1\\.ibd' is corrupted");
 call mtr.add_suppression("Table .*t1.* is compressed with (\\w+), which is not currently loaded. Please load the \\1 provider plugin to open the table");
 create table t1 (a int, b text ) engine = innodb page_compressed = 1;
 insert t1 (a, b) values (0, repeat("abc", 100));

mysql-test/suite/plugins/r/fulltext_notembedded.result

@@ -0,0 +1,8 @@
+#
+# MDEV-35050 Found wrong usage of mutex upon setting plugin session variables
+#
+install soname 'mypluglib';
+set session_track_system_variables="*";
+set session simple_parser_simple_thdvar_one = 10;
+uninstall soname 'mypluglib';
+# End of 10.5 tests

mysql-test/suite/plugins/r/fulltext_plugin.result

@@ -8,11 +8,3 @@ DROP TABLE t1;
 UNINSTALL PLUGIN simple_parser;
 show status like 'a%status';
 Variable_name	Value
-#
-# MDEV-35050 Found wrong usage of mutex upon setting plugin session variables
-#
-install soname 'mypluglib';
-set session_track_system_variables="*";
-set session simple_parser_simple_thdvar_one = 10;
-uninstall soname 'mypluglib';
-# End of 10.5 tests

mysql-test/suite/plugins/r/multiauth.result

@@ -150,12 +150,13 @@ show create user mysqltest1;
 CREATE USER for mysqltest1@%
 CREATE USER `mysqltest1`@`%` IDENTIFIED VIA unix_socket OR mysql_native_password USING '*BFE3F4604CFD21E6595080A261D92EF0183B5971'
 set password for mysqltest1 = password('foobar');
+ERROR HY000: SET PASSWORD is not applicable for users authenticating via unix_socket plugin
 show create user mysqltest1;
 CREATE USER for mysqltest1@%
 CREATE USER `mysqltest1`@`%` IDENTIFIED VIA unix_socket OR mysql_native_password USING '*9B500343BC52E2911172EB52AE5CF4847604C6E5'
 alter user mysqltest1 identified via unix_socket;
 set password for mysqltest1 = password('bla');
-ERROR HY000: SET PASSWORD is ignored for users authenticating via unix_socket plugin
+ERROR HY000: SET PASSWORD is not applicable for users authenticating via unix_socket plugin
 alter user mysqltest1 identified via mysql_native_password as password("some") or unix_socket;
 show create user mysqltest1;
 CREATE USER for mysqltest1@%

mysql-test/suite/plugins/r/pam.result

@@ -107,7 +107,7 @@ select user(), current_user(), database();
 user()	current_user()	database()
 pam_test@localhost	pam_test@%	test
 set password='foo';
-ERROR HY000: SET PASSWORD is ignored for users authenticating via pam plugin
+ERROR HY000: SET PASSWORD is not applicable for users authenticating via pam plugin
 show create user;
 CREATE USER for pam_test@%
 CREATE USER `pam_test`@`%` IDENTIFIED VIA pam USING 'mariadb_mtr'

mysql-test/suite/plugins/r/parsec.result

@@ -1,5 +1,5 @@
 create user test1@'%' identified via parsec using 'pwd';
-ERROR HY000: Operation CREATE USER failed for 'test1'@'%'
+ERROR HY000: Wrong ext-salt format
 create user test1@'%' identified via parsec using PASSWORD('pwd');
 show grants for test1@'%';
 Grants for test1@%

mysql-test/suite/plugins/r/password_reuse_check.result

@@ -61,14 +61,14 @@ grant select on *.* to user_name@localhost identified by 'test_pwd';
 ERROR HY000: Your password does not satisfy the current policy requirements (password_reuse_check)
 show warnings;
 Level	Code	Message
-Warning	1105	password_reuse_check:[1054] Unknown column 'hash' in 'field list'
+Warning	1105	password_reuse_check:[1054] Unknown column 'hash' in 'INSERT INTO'
 Error	1819	Your password does not satisfy the current policy requirements (password_reuse_check)
 set global password_reuse_check_interval= 10;
 grant select on *.* to user_name@localhost identified by 'test_pwd';
 ERROR HY000: Your password does not satisfy the current policy requirements (password_reuse_check)
 show warnings;
 Level	Code	Message
-Warning	1105	password_reuse_check:[1054] Unknown column 'time' in 'where clause'
+Warning	1105	password_reuse_check:[1054] Unknown column 'time' in 'WHERE'
 Error	1819	Your password does not satisfy the current policy requirements (password_reuse_check)
 drop table mysql.password_reuse_check_history;
 #