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 10.11 into 11.0

Browse Source
This commit is contained in:
Marko Mäkelä
2023-02-16 13:34:45 +02:00
parent 80b4fa54e1 1fd0099839
commit 2e431ff7e6
493 changed files with 7008 additions and 2592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/include/ctype_casefolding.inc Normal file
View File

@@ -0,0 +1,18 @@
CREATE OR REPLACE TABLE case_folding AS SELECT 0 AS code, SPACE(32) AS c LIMIT 0;
SHOW CREATE TABLE case_folding;
# Uncode code points that have a variable length case mapping in utf8
# (e.g. LOWER('2-byte-character') -> '3-byte-character'
INSERT INTO case_folding (code) VALUES
(0x23A),
(0x23E),
(0x23F),
(0x240),
(0x250),
(0x251),
(0x252),
(0x26B),
(0x271),
(0x27D);
UPDATE case_folding SET c=CHAR(code USING ucs2);
SELECT HEX(code), HEX(LOWER(c)), HEX(UPPER(c)), c FROM case_folding;
DROP TABLE case_folding;

1
mysql-test/include/master-slave.inc
View File

@@ -11,6 +11,7 @@
# [--let $rpl_skip_start_slave= 1]
# [--let $rpl_debug= 1]
# [--let $slave_timeout= NUMBER]
# [--let $rpl_server_skip_log_bin= 1]
# --source include/master-slave.inc
#
# Parameters:

16
mysql-test/include/rpl_init.inc
View File

@@ -73,6 +73,7 @@
# before CHANGE MASTER and START SLAVE. RESET MASTER and RESET
# SLAVE are suppressed if $rpl_skip_reset_master_and_slave is
# set.
# Also see $rpl_server_skip_log_bin.
#
# $rpl_skip_change_master
# By default, this script issues CHANGE MASTER so that all slaves
@@ -94,6 +95,10 @@
# Timeout used when waiting for the slave threads to start.
# See include/wait_for_slave_param.inc
#
# $rpl_server_skip_log_bin
# When $rpl_skip_reset_master_and_slave is not set
# RESET MASTER does not report ER_FLUSH_MASTER_BINLOG_CLOSED
# on any server.
#
# ==== Side effects ====
#
@@ -161,7 +166,16 @@ while ($_rpl_server)
USE test;
if (!$rpl_skip_reset_master_and_slave)
{
RESET MASTER;
if (!$rpl_server_skip_log_bin)
{
--error 0
RESET MASTER;
}
if ($rpl_server_skip_log_bin)
{
--error 0,ER_FLUSH_MASTER_BINLOG_CLOSED
RESET MASTER;
}
SET GLOBAL gtid_slave_pos= "";
RESET SLAVE;
}

2
mysql-test/include/world.inc
View File

@@ -215,7 +215,7 @@ INSERT IGNORE INTO Country VALUES
('TCD','Chad',1284000.00,7651000,3337),
('CZE','Czech Republic',78866.00,10278100,3339),
('TUN','Tunisia',163610.00,9586000,3349),
('TUR','Turkey',774815.00,66591000,3358),
('TUR','Türkiye',774815.00,66591000,3358),
('TKM','Turkmenistan',488100.00,4459000,3419),
('TCA','Turks and Caicos Islands',430.00,17000,3423),
('TUV','Tuvalu',26.00,12000,3424),