diff options
| author | Monty <monty@mariadb.org> | 2018-01-02 18:18:47 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-03 01:01:53 +0200 |
| commit | 22b4f469caefeb255aaaa18956afcbae210a1fad (patch) | |
| tree | 112bdca7450c144f571aad18ba6631a8d0343353 | |
| parent | b2115ce2353db77b1f89fd7acf83df205098f05e (diff) | |
| download | mariadb-git-22b4f469caefeb255aaaa18956afcbae210a1fad.tar.gz | |
MDEV-14813 rpl.rpl_ctype_latin1 fails in buildbot on Mac with wrong result
Make rpl_ctype_latin1 more portable by printing names in hex
Also only run if lower_case_table_names is 0, as this affects the result
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_ctype_latin1.result | 18 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_ctype_latin1.test | 8 |
2 files changed, 18 insertions, 8 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_ctype_latin1.result b/mysql-test/suite/rpl/r/rpl_ctype_latin1.result index 909aa639522..5399581ac26 100644 --- a/mysql-test/suite/rpl/r/rpl_ctype_latin1.result +++ b/mysql-test/suite/rpl/r/rpl_ctype_latin1.result @@ -10,13 +10,19 @@ 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; -SHOW TABLES LIKE 't%'; -Tables_in_test (t%) -tё -SHOW TABLES LIKE 'v%'; -Tables_in_test (v%) -vё +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 diff --git a/mysql-test/suite/rpl/t/rpl_ctype_latin1.test b/mysql-test/suite/rpl/t/rpl_ctype_latin1.test index a736d1a6485..a85254214d2 100644 --- a/mysql-test/suite/rpl/t/rpl_ctype_latin1.test +++ b/mysql-test/suite/rpl/t/rpl_ctype_latin1.test @@ -1,3 +1,4 @@ +--source include/have_lowercase0.inc --disable_warnings --source include/master-slave.inc --enable_warnings @@ -25,9 +26,12 @@ 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 -SHOW TABLES LIKE 't%'; -SHOW TABLES LIKE 'v%'; +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%'; |