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 bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-01-04 09:22:59 +02:00
parent acd2862e65 1a1bda2222
commit 145ae15a33
209 changed files with 6868 additions and 1522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mysql-test/suite/rpl/r/rpl_ctype_latin1.result Normal file
View File

@@ -0,0 +1,34 @@
include/master-slave.inc
[connection master]
#
# Start of 10.2 tests
#
#
# MDEV-14249 Wrong character set info of Query_log_event and the query in Query_log_event constructed by different charsets cause error when slave apply the event.
#
SET NAMES latin1;
CREATE TABLE `tё` (`tё` INT);
CREATE VIEW `vё` AS SELECT 'vё';
CREATE PROCEDURE `pё`() SELECT 'pё';
select hex(table_name) from information_schema.tables where table_schema="test" and table_name like "t%";
hex(table_name)
74C391E28098
select hex(table_name) from information_schema.tables where table_schema="test" and table_name like "v%";
hex(table_name)
76C391E28098
connection slave;
select hex(table_name) from information_schema.tables where table_schema="test" and table_name like "t%";
hex(table_name)
74C391E28098
select hex(table_name) from information_schema.tables where table_schema="test" and table_name like "v%";
hex(table_name)
76C391E28098
SHOW PROCEDURE STATUS LIKE 'p%';
Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation
test pё PROCEDURE root@localhost ts ts DEFINER latin1 latin1_swedish_ci latin1_swedish_ci
connection master;
DROP TABLE `tё`;
DROP VIEW `vё`;
DROP PROCEDURE `pё`;
connection slave;
include/rpl_end.inc

44
mysql-test/suite/rpl/t/rpl_ctype_latin1.test Normal file
View File

@@ -0,0 +1,44 @@
--source include/have_lowercase0.inc
--disable_warnings
--source include/master-slave.inc
--enable_warnings
--echo #
--echo # Start of 10.2 tests
--echo #
--echo #
--echo # MDEV-14249 Wrong character set info of Query_log_event and the query in Query_log_event constructed by different charsets cause error when slave apply the event.
--echo #
#
# The below tests uses a sequence of bytes 0xD191,
# which in a utf8 console looks like ё (CYRILIC SMALL LETTER YO).
# Don't be mislead. This sequence is used in latin1 context and
# represents a sequence of two characters:
# U+00D1 CAPITAL LATIN LETTER N WITH TILDE (_latin1 0xD1)
# U+2018 LEFT SINGLE QUOTATION MARK (_latin1 0x91)
#
SET NAMES latin1;
CREATE TABLE `tё` (`tё` INT);
CREATE VIEW `vё` AS SELECT 'vё';
CREATE PROCEDURE `pё`() SELECT 'pё';
select hex(table_name) from information_schema.tables where table_schema="test" and table_name like "t%";
select hex(table_name) from information_schema.tables where table_schema="test" and table_name like "v%";
--sync_slave_with_master
select hex(table_name) from information_schema.tables where table_schema="test" and table_name like "t%";
select hex(table_name) from information_schema.tables where table_schema="test" and table_name like "v%";
--replace_column 5 ts 6 ts
SHOW PROCEDURE STATUS LIKE 'p%';
--connection master
DROP TABLE `tё`;
DROP VIEW `vё`;
DROP PROCEDURE `pё`;
--sync_slave_with_master
--source include/rpl_end.inc

2
mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
View File

@@ -25,7 +25,7 @@ sync_slave_with_master;
connection master;
# Delete './master-bin.000001' from index file.
let $MYSQLD_DATADIR= `SELECT @@DATADIR`;
let $file= $MYSQLD_DATADIR/master-bin.index;
let TRUNCATE_FILE= $MYSQLD_DATADIR/master-bin.index;
source include/truncate_file.inc;
if (`SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) NOT IN ('Win32', 'Win64', 'Windows')`)