mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge branch '10.11' into 11.2
This commit is contained in:
@@ -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
|
||||
|
8
mysql-test/suite/plugins/r/fulltext_notembedded.result
Normal file
8
mysql-test/suite/plugins/r/fulltext_notembedded.result
Normal file
@@ -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
|
@@ -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
|
||||
|
@@ -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@%
|
||||
|
@@ -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'
|
||||
|
@@ -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;
|
||||
#
|
||||
|
12
mysql-test/suite/plugins/t/fulltext_notembedded.test
Normal file
12
mysql-test/suite/plugins/t/fulltext_notembedded.test
Normal file
@@ -0,0 +1,12 @@
|
||||
--source include/have_simple_parser.inc
|
||||
--source include/not_embedded.inc
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-35050 Found wrong usage of mutex upon setting plugin session variables
|
||||
--echo #
|
||||
install soname 'mypluglib';
|
||||
set session_track_system_variables="*";
|
||||
set session simple_parser_simple_thdvar_one = 10;
|
||||
uninstall soname 'mypluglib';
|
||||
|
||||
--echo # End of 10.5 tests
|
@@ -1,4 +1,3 @@
|
||||
--source include/not_embedded.inc
|
||||
--source include/have_simple_parser.inc
|
||||
|
||||
--echo #
|
||||
@@ -15,13 +14,3 @@ UNINSTALL PLUGIN simple_parser;
|
||||
# Bug #69682 - mysqld crashes after uninstall of plugin with "first" status var
|
||||
#
|
||||
show status like 'a%status';
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-35050 Found wrong usage of mutex upon setting plugin session variables
|
||||
--echo #
|
||||
install soname 'mypluglib';
|
||||
set session_track_system_variables="*";
|
||||
set session simple_parser_simple_thdvar_one = 10;
|
||||
uninstall soname 'mypluglib';
|
||||
|
||||
--echo # End of 10.5 tests
|
||||
|
@@ -162,6 +162,7 @@ set password for mysqltest1 = password('foobar');
|
||||
show create user mysqltest1;
|
||||
alter user mysqltest1 identified via unix_socket OR mysql_native_password as password("some");
|
||||
show create user mysqltest1;
|
||||
--error ER_SET_PASSWORD_AUTH_PLUGIN
|
||||
set password for mysqltest1 = password('foobar');
|
||||
show create user mysqltest1;
|
||||
alter user mysqltest1 identified via unix_socket;
|
||||
|
Reference in New Issue
Block a user