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

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Sergei Golubchik
2024-04-22 11:00:03 +02:00
parent 75488a57f2 e83d92ee5e
commit 018d537ec1
418 changed files with 7074 additions and 2930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mysql-test/suite/sys_vars/r/debug_dbug_utf16le.result Normal file
View File

@@ -0,0 +1,31 @@
#
# Start of 10.5 tests
#
#
# MDEV-28366 GLOBAL debug_dbug setting affected by collation_connection=utf16...
#
SET NAMES utf8;
SET collation_connection=utf16le_general_ci;
SET debug_dbug='d,any_random_string';
SELECT @@debug_dbug;
@@debug_dbug
d,any_random_string
SET debug_dbug=CONCAT('d,', _latin1 0xDF);
SELECT @@debug_dbug;
@@debug_dbug
d,ß
SELECT HEX(@@debug_dbug);
HEX(@@debug_dbug)
642CC39F
SET @@debug_dbug=NULL;
SELECT @@debug_dbug;
@@debug_dbug
SET @@debug_dbug=DEFAULT;
SELECT @@debug_dbug;
@@debug_dbug
SET NAMES latin1;
#
# End of 10.5 tests
#

8
mysql-test/suite/sys_vars/r/replicate_rewrite_db.result
View File

@@ -85,15 +85,13 @@ SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate
VARIABLE_NAME VARIABLE_VALUE
REPLICATE_REWRITE_DB db1->db2,db3->db4
# Check restart with appending the value
# restart: --replicate_rewrite_db=X->Y
# restart: --replicate_rewrite_db='X->Y'
SELECT @@GLOBAL.replicate_rewrite_db;
@@GLOBAL.replicate_rewrite_db
test->rewrite,mysqltest1->test,a->b,X->Y
test->rewrite,mysqltest1->test,a->b,'X->Y'
# Check restart with wrong value on CLI
[ERROR] Bad syntax in replicate-rewrite-db.Expected syntax is FROM->TO.
# restart:
# restart
SELECT @@GLOBAL.replicate_rewrite_db;
@@GLOBAL.replicate_rewrite_db
test->rewrite,mysqltest1->test,a->b
# Cleanup.
SET @@GLOBAL.replicate_rewrite_db = @save_replicate_rewrite_db;

4
mysql-test/suite/sys_vars/t/allow_suspicious_udfs.test
View File

@@ -5,10 +5,10 @@
SELECT @@allow_suspicious_udfs AS EXPECT_0;
# Restart the server the server with "--allow-suspicious-udfs" option
--let $restart_parameters = "--allow-suspicious-udfs"
--let $restart_parameters = --allow-suspicious-udfs
--source include/restart_mysqld.inc
SELECT @@allow_suspicious_udfs AS EXPECT_1;
# Disable "--allow-suspicious-udfs" to restore the original state
--let $restart_parameters = "--skip-allow-suspicious-udfs"
--let $restart_parameters = --skip-allow-suspicious-udfs
--source include/restart_mysqld.inc

29
mysql-test/suite/sys_vars/t/debug_dbug_utf16le.test Normal file
View File

@@ -0,0 +1,29 @@
--source include/have_debug.inc
--source include/have_utf16.inc
--echo #
--echo # Start of 10.5 tests
--echo #
--echo #
--echo # MDEV-28366 GLOBAL debug_dbug setting affected by collation_connection=utf16...
--echo #
SET NAMES utf8;
SET collation_connection=utf16le_general_ci;
SET debug_dbug='d,any_random_string';
SELECT @@debug_dbug;
SET debug_dbug=CONCAT('d,', _latin1 0xDF);
SELECT @@debug_dbug;
SELECT HEX(@@debug_dbug);
SET @@debug_dbug=NULL;
SELECT @@debug_dbug;
SET @@debug_dbug=DEFAULT;
SELECT @@debug_dbug;
SET NAMES latin1;
--echo #
--echo # End of 10.5 tests
--echo #

7
mysql-test/suite/sys_vars/t/replicate_rewrite_db.test
View File

@@ -63,7 +63,7 @@ SELECT @@GLOBAL.replicate_rewrite_db;
SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='replicate_rewrite_db';
--echo # Check restart with appending the value
--let $restart_parameters = "--replicate_rewrite_db='X->Y'"
--let $restart_parameters = --replicate_rewrite_db='X->Y'
--source include/restart_mysqld.inc
SELECT @@GLOBAL.replicate_rewrite_db;
@@ -76,9 +76,6 @@ SELECT @@GLOBAL.replicate_rewrite_db;
--replace_regex /mysqld/mariadbd/ /\d\d\d\d-\d*-\d* *\d*:\d*:\d* \d* //
--cat_file $MYSQL_TMP_DIR/mysqld--replicate.err
# Restart the server with the default options
--let $restart_parameters = ""
--let $restart_parameters =
--source include/start_mysqld.inc
SELECT @@GLOBAL.replicate_rewrite_db;
--echo # Cleanup.
SET @@GLOBAL.replicate_rewrite_db = @save_replicate_rewrite_db;