WL#7554 Switch to new default character set and change mtr test cases

Author: berntm

cmake/character_sets.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,11 +15,11 @@
 
 # Charsets and collations
 IF(NOT DEFAULT_CHARSET)
-  SET(DEFAULT_CHARSET "latin1")
+  SET(DEFAULT_CHARSET "utf8mb4")
 ENDIF()
 
 IF(NOT DEFAULT_COLLATION)
-  SET(DEFAULT_COLLATION "latin1_swedish_ci")
+  SET(DEFAULT_COLLATION "utf8mb4_0900_ai_ci")
 ENDIF()
 
 IF(WITH_EXTRA_CHARSETS AND NOT WITH_EXTRA_CHARSETS STREQUAL "all")

mysql-test/collections/mysql-trunk-wl7554.push

@@ -0,0 +1,4 @@
+# perl mysql-test-run.pl --parallel=auto --force --max-test-fail=0 --retry=1 --retry-failure=1 --experimental=./collections/default.experimental --big-test --comment=utf8mb4
+# perl mysql-test-run.pl --parallel=auto --force --max-test-fail=0 --retry=1 --retry-failure=1 --experimental=./collections/default.experimental --big-test --comment=utf8mb4-extra --suite=collations,engines,funcs_2,interactive_utilities,jp,test_services,x,group_replication,memcached
+perl mysql-test-run.pl --debug-server --parallel=auto --force --max-test-fail=0 --retry=1 --retry-failure=1 --experimental=./collections/default.experimental --big-test --testcase-timeout=60 --suite-timeout=600 --comment=utf8mb4
+perl mysql-test-run.pl --debug-server --parallel=auto --force --max-test-fail=0 --retry=1 --retry-failure=1 --experimental=./collections/default.experimental --big-test --testcase-timeout=60 --suite-timeout=600 --comment=utf8mb4-extra --suite=collations,engines,funcs_2,interactive_utilities,jp,test_services,x,group_replication,memcached

mysql-test/extra/rpl_tests/check_type.inc

@@ -33,7 +33,7 @@ enable_warnings;
 eval CREATE TABLE t1(
   pk INT NOT NULL PRIMARY KEY,
   a $source_type
-) ENGINE=$engine_type;
+) ENGINE=$engine_type CHARACTER SET latin1;
 --source include/sync_slave_sql_with_master.inc
 eval ALTER TABLE t1 MODIFY a $target_type;
 

mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test

@@ -54,9 +54,9 @@ SET GLOBAL binlog_stmt_cache_size = 4096;
 disconnect master;
 connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
 
-CREATE TABLE t1(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=Innodb;
-CREATE TABLE t2(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=MyIsam;
-CREATE TABLE t3(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=Innodb;
+CREATE TABLE t1(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=Innodb CHARACTER SET latin1;
+CREATE TABLE t2(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=MyIsam CHARACTER SET latin1;
+CREATE TABLE t3(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=Innodb CHARACTER SET latin1;
 
 let $data = `select concat('"', repeat('a',2000), '"')`;
 
@@ -260,7 +260,7 @@ TRUNCATE TABLE t3;
 
 DELIMITER //;
 
-CREATE PROCEDURE p1(pd VARCHAR(30000))
+CREATE PROCEDURE p1(pd VARCHAR(30000) CHARACTER SET latin1)
 BEGIN
   INSERT INTO t1 (a, data) VALUES (1, pd);
   INSERT INTO t1 (a, data) VALUES (2, pd);

mysql-test/extra/rpl_tests/rpl_insert_id.test

@@ -301,14 +301,14 @@ drop table t1;
 eval CREATE TABLE t1 (
   id bigint(20) unsigned NOT NULL auto_increment,
   field_1 int(10) unsigned NOT NULL,
-  field_2 varchar(255) NOT NULL,
+  field_2 varchar(249) NOT NULL,
   field_3 varchar(255) NOT NULL,
   PRIMARY KEY (id),
   UNIQUE KEY field_1 (field_1, field_2)
 ) ENGINE=$engine_type;
 eval CREATE TABLE t2 (
   field_a int(10) unsigned NOT NULL,
-  field_b varchar(255) NOT NULL,
+  field_b varchar(249) NOT NULL,
   field_c varchar(255) NOT NULL
 ) ENGINE=$engine_type;
 INSERT INTO t2 (field_a, field_b, field_c) VALUES (1, 'a', '1a');

mysql-test/include/func_aes_block.inc

@@ -74,8 +74,8 @@ SET SESSION block_encryption_mode=DEFAULT;
 --echo #### 128, 192 and 256 bit $block_mode
 
 
-eval CREATE TABLE aes_$block_mode(a VARCHAR(128), b128 VARCHAR(144),
-  b192 VARCHAR(144), b256 CHAR(144));
+eval CREATE TABLE aes_$block_mode(a VARBINARY(128), b128 VARBINARY(144),
+  b192 VARBINARY(144), b256 BINARY(144));
 eval INSERT INTO aes_$block_mode (a) VALUES (REPEAT('a', 128));
 eval INSERT INTO aes_$block_mode (a) VALUES (REPEAT(0x00313233, 32));
 

mysql-test/include/memcache_config.inc

@@ -1,4 +1,4 @@
-create database innodb_memcache;
+create database innodb_memcache character set latin1;
 
 use innodb_memcache;