database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '11.6' into 11.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-11-09 19:01:12 +01:00
parent 7aa28a2a54 d8dad8c3b5
commit b12ff287ec
789 changed files with 10342 additions and 4415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/plugins/r/audit_null.result
View File

@@ -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

14
mysql-test/suite/plugins/r/auth_ed25519.result
View File

@@ -70,6 +70,20 @@ current_user()
test1@localhost
disconnect con1;
connection default;
create user test2@localhost identified via ed25519 using PASSWORD('');
show grants for test2@localhost;
Grants for test2@localhost
GRANT USAGE ON *.* TO `test2`@`localhost` IDENTIFIED VIA ed25519 USING '4LH+dBF+G5W2CKTyId8xR3SyDqZoQjUNUVNxx8aWbG4'
connect con2, localhost, test2,;
select current_user();
current_user()
test2@localhost
disconnect con2;
connect(localhost,test2,wrong_pwd,test,MASTER_MYPORT,MASTER_MYSOCK);
connect con3, localhost, test2, "wrong_pwd";
ERROR 28000: Access denied for user 'test2'@'localhost' (using password: YES)
connection default;
drop user test2@localhost;
drop user test1@localhost;
uninstall plugin ed25519;
select ed25519_password("foo");

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

@@ -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

1
mysql-test/suite/plugins/r/compression.result
View File

@@ -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));

8
mysql-test/suite/plugins/r/fulltext_notembedded.result Normal file
View 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
mysql-test/suite/plugins/r/fulltext_plugin.result
View File

@@ -8,14 +8,6 @@ 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;
set session_track_system_variables="";
uninstall soname 'mypluglib';
# End of 10.5 tests
#
# MDEV-35308 NO_KEY_OPTIONS SQL mode has no effect on engine key options

3
mysql-test/suite/plugins/r/multiauth.result
View File

@@ -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@%

2
mysql-test/suite/plugins/r/pam.result
View File

@@ -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'

17
mysql-test/suite/plugins/r/parsec.result
View File

@@ -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@%
@@ -28,3 +28,18 @@ test.have_ssl()
yes
drop function have_ssl;
drop user test1@'%';
# MDEV-34854 Parsec sends garbage when using an empty password
create user test2@'%' identified via parsec using PASSWORD('');
show grants for test2@'%';
Grants for test2@%
GRANT USAGE ON *.* TO `test2`@`%` IDENTIFIED VIA parsec USING 'P0:salt:password'
connect con4, localhost, test2,;
select 4, USER(), CURRENT_USER();
4 USER() CURRENT_USER()
4 test2@localhost test2@%
disconnect con4;
connect(localhost,test2,wrong_pwd,test,MASTER_MYPORT,MASTER_MYSOCK);
connect con5, localhost, test2, "wrong_pwd";
ERROR 28000: Access denied for user 'test2'@'localhost' (using password: NO)
connection default;
drop user test2@'%';

4
mysql-test/suite/plugins/r/password_reuse_check.result
View File

@@ -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/auth_ed25519.test
View File

@@ -50,6 +50,18 @@ select current_user();
disconnect con1;
connection default;
create user test2@localhost identified via ed25519 using PASSWORD('');
show grants for test2@localhost;
connect con2, localhost, test2,;
select current_user();
disconnect con2;
replace_result $MASTER_MYSOCK MASTER_MYSOCK $MASTER_MYPORT MASTER_MYPORT;
error ER_ACCESS_DENIED_ERROR;
connect con3, localhost, test2, "wrong_pwd";
connection default;
drop user test2@localhost;
drop user test1@localhost;
uninstall plugin ed25519;
error ER_CANT_INITIALIZE_UDF;

1
mysql-test/suite/plugins/t/compression.test
View File

@@ -22,6 +22,7 @@ if ($engine == "innodb") {
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");
}
if ($engine == "mroonga") {

12
mysql-test/suite/plugins/t/fulltext_notembedded.test Normal file
View 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

10
mysql-test/suite/plugins/t/fulltext_plugin.test
View File

@@ -1,4 +1,3 @@
--source include/not_embedded.inc
--source include/have_simple_parser.inc
--echo #
@@ -16,15 +15,6 @@ UNINSTALL PLUGIN simple_parser;
#
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;
set session_track_system_variables="";
uninstall soname 'mypluglib';
--echo # End of 10.5 tests
--echo #

1
mysql-test/suite/plugins/t/multiauth.test
View File

@@ -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;

17
mysql-test/suite/plugins/t/parsec.test
View File

@@ -9,7 +9,7 @@ if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'pa
if (!$PARSEC_SO) {
skip No auth_parsec plugin;
}
--error ER_CANNOT_USER
--error ER_PASSWD_LENGTH
create user test1@'%' identified via parsec using 'pwd';
create user test1@'%' identified via parsec using PASSWORD('pwd');
--replace_regex /:[A-Za-z0-9+\/]{43}'/:password'/ /:[A-Za-z0-9+\/]{24}:/:salt:/
@@ -43,3 +43,18 @@ if ($MTR_COMBINATION_WIN) {
drop function have_ssl;
drop user test1@'%';
--echo # MDEV-34854 Parsec sends garbage when using an empty password
create user test2@'%' identified via parsec using PASSWORD('');
--replace_regex /:[A-Za-z0-9+\/]{43}'/:password'/ /:[A-Za-z0-9+\/]{24}:/:salt:/
show grants for test2@'%';
connect con4, localhost, test2,;
select 4, USER(), CURRENT_USER();
disconnect con4;
--replace_result $MASTER_MYSOCK MASTER_MYSOCK $MASTER_MYPORT MASTER_MYPORT
--error ER_ACCESS_DENIED_ERROR
connect con5, localhost, test2, "wrong_pwd";
connection default;
drop user test2@'%';