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 remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source 
Conflicts:
	cmake/make_dist.cmake.in
	mysql-test/r/func_json.result
	mysql-test/r/ps.result
	mysql-test/t/func_json.test
	mysql-test/t/ps.test
	sql/item_cmpfunc.h
This commit is contained in:
Monty
2018-01-01 19:39:59 +02:00
parent afbb72b3b6 aed2050e40
commit fbab79c9b8
161 changed files with 4321 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,28 @@
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ё';
connection slave;
SHOW TABLES LIKE 't%';
Tables_in_test (t%)
tё
SHOW TABLES LIKE 'v%';
Tables_in_test (v%)
vё
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

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

@@ -0,0 +1,40 @@
--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ё';
--sync_slave_with_master
SHOW TABLES LIKE 't%';
SHOW TABLES 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