fix(mtr):move character_set to test.character_set, fix main mtr_test and innodb mtr_test(#277)

mysql-test/include/default_mysqld.cnf

@@ -27,6 +27,8 @@ slave-net-timeout=120
 
 log-bin=mysqld-bin
 
+optimizer_switch='index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on,engine_condition_pushdown=on,index_condition_pushdown=on,mrr=on,mrr_cost_based=on,block_nested_loop=on,batched_key_access=off,materialization=on,semijoin=on,loosescan=on,firstmatch=on,duplicateweedout=on,subquery_materialization_cost_based=on,use_index_extensions=on,condition_fanout_filter=on,derived_merge=on,prefer_ordering_index=on'
+
 # MAINTAINER:
 # the loose- syntax is to make sure the cnf file is also
 # valid when building without the performance schema.

mysql-test/r/mysqld--help-notwin.result

@@ -1404,11 +1404,11 @@ block-encryption-mode aes-128-ecb
 bulk-insert-buffer-size 8388608
 character-set-client-handshake TRUE
 character-set-filesystem binary
-character-set-server utf8mb4
+character-set-server utf8
 character-sets-dir MYSQL_CHARSETSDIR/
 check-proxy-users FALSE
 chroot (No default value)
-collation-server utf8mb4_general_ci
+collation-server utf8_general_ci
 completion-type NO_CHAIN
 concurrent-insert AUTO
 connect-timeout 10

mysql-test/r/mysqld_daemon.result

@@ -1,7 +1,9 @@
 Database
 information_schema
+cache
 mtr
 mysql
 performance_schema
 sys
+sys_stonedb
 test

mysql-test/r/mysqld_safe.result

@@ -1,15 +1,19 @@
 use test;
 Database
 information_schema
+cache
 mtr
 mysql
 performance_schema
 sys
+sys_stonedb
 test
 Database
 information_schema
+cache
 mtr
 mysql
 performance_schema
 sys
+sys_stonedb
 test

mysql-test/r/mysqldump_bugs.result

@@ -81,7 +81,7 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db4` /*!40100 DEFAULT CHARACTER SET la
 
 USE `db4`;
 
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mtr` /*!40100 DEFAULT CHARACTER SET utf8mb4 */;
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mtr` /*!40100 DEFAULT CHARACTER SET utf8 */;
 
 USE `mtr`;
 

mysql-test/r/mysqlpump_extended.result

@@ -18,11 +18,13 @@ DROP DATABASE db1_extended;
 SHOW DATABASES;
 Database
 information_schema
+cache
 db2_extended
 mtr
 mysql
 performance_schema
 sys
+sys_stonedb
 test
 DROP DATABASE db2_extended;
 # test exclude-events
@@ -171,12 +173,14 @@ DROP DATABASE db4_extended;
 SHOW DATABASES;
 Database
 information_schema
+cache
 db2_extended
 db4_extended
 mtr
 mysql
 performance_schema
 sys
+sys_stonedb
 test
 DROP DATABASE db2_extended;
 DROP DATABASE db4_extended;

mysql-test/suite/innodb/r/innodb-system-table-view.result

@@ -74,7 +74,7 @@ table_id	pos	mtype	prtype	len	name
 25	4	13	2163198	24	Abbreviation
 26	0	6	1288	8	Transition_time
 26	1	6	1283	4	Correction
-32	0	13	2949630	144	source_uuid
+32	0	13	2163198	108	source_uuid
 32	1	6	1288	8	interval_start
 32	2	6	1288	8	interval_end
 33	0	12	2162959	192	cost_name