fix(mtr):mtr result stonedb change to tianmu(#359) (#368)

* fix(mtr):mysqlpump*.test sys_stoendb to sys_tianmu

fix(mtr):fix main result stonedb to tianmu

fix(mtr):mv innodb_fts.ngram_1 to test/innodb_fts

fix(mtr):fix mtr funcs_1 stonedb to tianmu

fix(mtr):fix innodb mtr result stonedb change to tianmu

fix(mtr):fix perfschema mtr result stonedb change to tianmu

* fix(mtr):fix mtr stoendb change to tianmu
Co-authored-by: Nmergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

mysql-test/r/1st.result

@@ -4,7 +4,7 @@ information_schema
 cache
 mtr
 mysql
-sys_stonedb
+sys_tianmu
 test
 show tables in mysql;
 Tables_in_mysql

mysql-test/r/drop.result

@@ -52,7 +52,7 @@ mtr
 mysql
 mysqltest
 performance_schema
-sys_stonedb
+sys_tianmu
 test
 flush tables with read lock;
 drop database mysqltest;
@@ -66,7 +66,7 @@ cache
 mtr
 mysql
 performance_schema
-sys_stonedb
+sys_tianmu
 test
 drop database mysqltest;
 ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist

mysql-test/r/log_tables_upgrade.result

@@ -44,10 +44,10 @@ mysql.user                                         OK
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 DROP TABLE general_log;
 RENAME TABLE renamed_general_log TO general_log;
 SET GLOBAL general_log = @saved_general_log;

mysql-test/r/mysql_config_editor.result

@@ -100,7 +100,7 @@ user = test_user4
 ##############################################
 # Tests for mysql_config_editor's help command
 ##############################################
-Copyright (c) 2012, 2022 StoneAtom Group Holding Limited
+Copyright (c) 2021, 2022 StoneAtom Group Holding Limited
 MySQL Configuration Utility.
   -?, --help          Display this help and exit.
   -v, --verbose       Write more information.

mysql-test/r/mysql_upgrade_ssl.result

@@ -35,10 +35,10 @@ mysql.user                                         OK
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 #
 # WL #8350 ENSURE 5.7 SUPPORTS SMOOTH LIVE UPGRADE FROM 5.6
 #
@@ -99,10 +99,10 @@ mysql.user                                         OK
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 DROP USER 'user_sha_pass_wp'@'%';
 TRUNCATE TABLE mysql.user;
 INSERT INTO mysql.user SELECT * FROM tmp_user;

mysql-test/r/mysql_upgrade_with_session_user.result

@@ -38,10 +38,10 @@ mysql.user                                         OK
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 include/assert.inc [The session user should exist after upgrade]
 #
 # Change some user privileges, making it invalid

mysql-test/r/mysqlcheck.result

@@ -37,13 +37,13 @@ mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
 mysql.user                                         OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl
+sys_tianmu.column_ttl
 note     : The storage engine for the table doesn't support analyze
-sys_stonedb.columns
+sys_tianmu.columns
 note     : The storage engine for the table doesn't support analyze
-sys_stonedb.decomposition_dictionary
+sys_tianmu.decomposition_dictionary
 note     : The storage engine for the table doesn't support analyze
-sys_stonedb.logs
+sys_tianmu.logs
 note     : The storage engine for the table doesn't support analyze
 mtr.global_suppressions                            Table is already up to date
 mtr.test_suppressions                              Table is already up to date
@@ -122,13 +122,13 @@ mysql.user                                         OK
 sys.sys_config
 note     : Table does not support optimize, doing recreate + analyze instead
 status   : OK
-sys_stonedb.column_ttl
+sys_tianmu.column_ttl
 note     : The storage engine for the table doesn't support optimize
-sys_stonedb.columns
+sys_tianmu.columns
 note     : The storage engine for the table doesn't support optimize
-sys_stonedb.decomposition_dictionary
+sys_tianmu.decomposition_dictionary
 note     : The storage engine for the table doesn't support optimize
-sys_stonedb.logs
+sys_tianmu.logs
 note     : The storage engine for the table doesn't support optimize
 mysql.columns_priv                                 OK
 mysql.db                                           OK

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

@@ -1202,95 +1202,6 @@ The following options may be given as the first argument:
  replication.
  --sql-mode=name     Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
  for the complete list of valid sql modes
- --stonedb-async-join=name 
- Set async join params: packStep;traverseCount;matchCount
- --stonedb-bg-load-threads=# 
- --stonedb-cachinglevel=# 
- --stonedb-compensation-start 
- --stonedb-control-trace[=#] 
- ini controltrace
- --stonedb-data-dir=name 
- Specifies a directory to add to the stonedb data storage.
- --stonedb-data-distribution-policy=name 
- Specifies the policy to distribute column data among
- multiple data directories.Possible values are
- round-robin(default), random, and space
- --stonedb-disk-usage-threshold=# 
- Specifies the disk usage threshold for data diretories.
- --stonedb-distinct-cache-size=# 
- Upper byte limit for GroupDistinctCache buffer
- --stonedb-enable-histogram-cmap-bloom 
- --stonedb-enable-rowstore 
- (Defaults to on; use --skip-stonedb-enable-rowstore to disable.)
- --stonedb-filterevaluation-speedup 
- (Defaults to on; use --skip-stonedb-filterevaluation-speedup to disable.)
- --stonedb-force-hashjoin 
- --stonedb-global-debug-level=# 
- global debug level
- --stonedb-groupby-speedup 
- (Defaults to on; use --skip-stonedb-groupby-speedup to disable.)
- --stonedb-hugefiledir=name 
- --stonedb-index-cache-size=# 
- Index cache size in MB
- --stonedb-index-search 
- (Defaults to on; use --skip-stonedb-index-search to disable.)
- --stonedb-ini-allowmysqlquerypath=# 
- --stonedb-ini-cachefolder=name 
- --stonedb-ini-cachereleasethreshold=# 
- --stonedb-ini-cachesizethreshold=# 
- --stonedb-ini-controlquerylog=# 
- global controlquerylog
- --stonedb-ini-knlevel=# 
- --stonedb-ini-pushdown 
- (Defaults to on; use --skip-stonedb-ini-pushdown to disable.)
- --stonedb-ini-servermainheapsize=# 
- --stonedb-ini-threadpoolsize=# 
- --stonedb-ini-usemysqlimportexportdefaults 
- --stonedb-insert-buffer-size=# 
- --stonedb-insert-cntthreshold=# 
- --stonedb-insert-delayed 
- (Defaults to on; use --skip-stonedb-insert-delayed to disable.)
- --stonedb-insert-max-buffered=# 
- --stonedb-insert-numthreshold=# 
- --stonedb-insert-wait-ms=# 
- --stonedb-insert-wait-time=# 
- --stonedb-join-disable-switch-side 
- --stonedb-join-parallel=# 
- join matching parallel: 0-Disabled, 1-Auto, N-specify
- count
- --stonedb-join-splitrows=# 
- join split rows:0-Disabled, 1-Auto, N-specify count
- --stonedb-load-threads=# 
- --stonedb-lookup-max-size=# 
- Lookup dictionary max size
- --stonedb-max-execution-time=# 
- max query execution time in seconds
- --stonedb-minmax-speedup 
- (Defaults to on; use --skip-stonedb-minmax-speedup to disable.)
- --stonedb-mm-hardlimit=# 
- --stonedb-mm-largetemppool-threshold=# 
- size threshold in MB for using large temp thread pool
- --stonedb-mm-largetempratio=# 
- --stonedb-mm-policy=name 
- --stonedb-mm-releasepolicy=name 
- --stonedb-orderby-speedup 
- --stonedb-parallel-filloutput 
- (Defaults to on; use --skip-stonedb-parallel-filloutput to disable.)
- --stonedb-parallel-mapjoin 
- --stonedb-qps-log   -
- (Defaults to on; use --skip-stonedb-qps-log to disable.)
- --stonedb-query-threads=# 
- --stonedb-refresh-sys-stonedb 
- (Defaults to on; use --skip-stonedb-refresh-sys-stonedb to disable.)
- --stonedb-result-sender-rows=# 
- The number of rows to load at a time when processing
- queries like select xxx from yyya
- --stonedb-session-debug-level=# 
- session debug level
- --stonedb-start-async=# 
- Enable async, specifies async threads x/100 * cpus
- --stonedb-sync-buffers=# 
- --stonedb-trigger-error=name 
  --stored-program-cache=# 
  The soft upper limit for number of cached stored routines
  for one connection.
@@ -1332,6 +1243,95 @@ The following options may be given as the first argument:
  Define threads usage for handling queries, one of
  one-thread-per-connection, no-threads, loaded-dynamically
  --thread-stack=#    The stack size for each thread
+ --tianmu-async-join=name 
+ Set async join params: packStep;traverseCount;matchCount
+ --tianmu-bg-load-threads=# 
+ --tianmu-cachinglevel=# 
+ --tianmu-compensation-start 
+ --tianmu-control-trace[=#] 
+ ini controltrace
+ --tianmu-data-dir=name 
+ Specifies a directory to add to the tianmu data storage.
+ --tianmu-data-distribution-policy=name 
+ Specifies the policy to distribute column data among
+ multiple data directories.Possible values are
+ round-robin(default), random, and space
+ --tianmu-disk-usage-threshold=# 
+ Specifies the disk usage threshold for data diretories.
+ --tianmu-distinct-cache-size=# 
+ Upper byte limit for GroupDistinctCache buffer
+ --tianmu-enable-histogram-cmap-bloom 
+ --tianmu-enable-rowstore 
+ (Defaults to on; use --skip-tianmu-enable-rowstore to disable.)
+ --tianmu-filterevaluation-speedup 
+ (Defaults to on; use --skip-tianmu-filterevaluation-speedup to disable.)
+ --tianmu-force-hashjoin 
+ --tianmu-global-debug-level=# 
+ global debug level
+ --tianmu-groupby-speedup 
+ (Defaults to on; use --skip-tianmu-groupby-speedup to disable.)
+ --tianmu-hugefiledir=name 
+ --tianmu-index-cache-size=# 
+ Index cache size in MB
+ --tianmu-index-search 
+ (Defaults to on; use --skip-tianmu-index-search to disable.)
+ --tianmu-ini-allowmysqlquerypath=# 
+ --tianmu-ini-cachefolder=name 
+ --tianmu-ini-cachereleasethreshold=# 
+ --tianmu-ini-cachesizethreshold=# 
+ --tianmu-ini-controlquerylog=# 
+ global controlquerylog
+ --tianmu-ini-knlevel=# 
+ --tianmu-ini-pushdown 
+ (Defaults to on; use --skip-tianmu-ini-pushdown to disable.)
+ --tianmu-ini-servermainheapsize=# 
+ --tianmu-ini-threadpoolsize=# 
+ --tianmu-ini-usemysqlimportexportdefaults 
+ --tianmu-insert-buffer-size=# 
+ --tianmu-insert-cntthreshold=# 
+ --tianmu-insert-delayed 
+ (Defaults to on; use --skip-tianmu-insert-delayed to disable.)
+ --tianmu-insert-max-buffered=# 
+ --tianmu-insert-numthreshold=# 
+ --tianmu-insert-wait-ms=# 
+ --tianmu-insert-wait-time=# 
+ --tianmu-join-disable-switch-side 
+ --tianmu-join-parallel=# 
+ join matching parallel: 0-Disabled, 1-Auto, N-specify
+ count
+ --tianmu-join-splitrows=# 
+ join split rows:0-Disabled, 1-Auto, N-specify count
+ --tianmu-load-threads=# 
+ --tianmu-lookup-max-size=# 
+ Lookup dictionary max size
+ --tianmu-max-execution-time=# 
+ max query execution time in seconds
+ --tianmu-minmax-speedup 
+ (Defaults to on; use --skip-tianmu-minmax-speedup to disable.)
+ --tianmu-mm-hardlimit=# 
+ --tianmu-mm-largetemppool-threshold=# 
+ size threshold in MB for using large temp thread pool
+ --tianmu-mm-largetempratio=# 
+ --tianmu-mm-policy=name 
+ --tianmu-mm-releasepolicy=name 
+ --tianmu-orderby-speedup 
+ --tianmu-parallel-filloutput 
+ (Defaults to on; use --skip-tianmu-parallel-filloutput to disable.)
+ --tianmu-parallel-mapjoin 
+ --tianmu-qps-log    -
+ (Defaults to on; use --skip-tianmu-qps-log to disable.)
+ --tianmu-query-threads=# 
+ --tianmu-refresh-sys-tianmu 
+ (Defaults to on; use --skip-tianmu-refresh-sys-tianmu to disable.)
+ --tianmu-result-sender-rows=# 
+ The number of rows to load at a time when processing
+ queries like select xxx from yyya
+ --tianmu-session-debug-level=# 
+ session debug level
+ --tianmu-start-async=# 
+ Enable async, specifies async threads x/100 * cpus
+ --tianmu-sync-buffers=# 
+ --tianmu-trigger-error=name 
  --time-format=name  The TIME format (ignored)
  --tls-version=name  TLS version, permitted values are TLSv1, TLSv1.1,
  TLSv1.2(Only for openssl)
@@ -1418,7 +1418,7 @@ date-format %Y-%m-%d
 datetime-format %Y-%m-%d %H:%i:%s
 default-authentication-plugin mysql_native_password
 default-password-lifetime 0
-default-storage-engine stonedb
+default-storage-engine tianmu
 default-time-zone (No default value)
 default-tmp-storage-engine InnoDB
 default-week-format 0
@@ -1698,63 +1698,6 @@ slow-query-log FALSE
 sort-buffer-size 262144
 sporadic-binlog-dump-fail FALSE
 sql-mode ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
-stonedb-async-join 1;0;0;0
-stonedb-bg-load-threads 0
-stonedb-cachinglevel 1
-stonedb-compensation-start FALSE
-stonedb-control-trace 0
-stonedb-data-distribution-policy space
-stonedb-disk-usage-threshold 85
-stonedb-distinct-cache-size 64
-stonedb-enable-histogram-cmap-bloom FALSE
-stonedb-enable-rowstore TRUE
-stonedb-filterevaluation-speedup TRUE
-stonedb-force-hashjoin FALSE
-stonedb-global-debug-level 4
-stonedb-groupby-speedup TRUE
-stonedb-hugefiledir 
-stonedb-index-cache-size 0
-stonedb-index-search TRUE
-stonedb-ini-allowmysqlquerypath 0
-stonedb-ini-cachefolder cache
-stonedb-ini-cachereleasethreshold 100
-stonedb-ini-cachesizethreshold 4
-stonedb-ini-controlquerylog 1
-stonedb-ini-knlevel 99
-stonedb-ini-pushdown TRUE
-stonedb-ini-servermainheapsize 0
-stonedb-ini-threadpoolsize 1
-stonedb-ini-usemysqlimportexportdefaults FALSE
-stonedb-insert-buffer-size 512
-stonedb-insert-cntthreshold 2
-stonedb-insert-delayed TRUE
-stonedb-insert-max-buffered 65536
-stonedb-insert-numthreshold 10000
-stonedb-insert-wait-ms 100
-stonedb-insert-wait-time 1000
-stonedb-join-disable-switch-side FALSE
-stonedb-join-parallel 1
-stonedb-join-splitrows 0
-stonedb-load-threads 0
-stonedb-lookup-max-size 100000
-stonedb-max-execution-time 0
-stonedb-minmax-speedup TRUE
-stonedb-mm-hardlimit 0
-stonedb-mm-largetemppool-threshold 16
-stonedb-mm-largetempratio 0
-stonedb-mm-policy 
-stonedb-mm-releasepolicy 2q
-stonedb-orderby-speedup FALSE
-stonedb-parallel-filloutput TRUE
-stonedb-parallel-mapjoin FALSE
-stonedb-qps-log TRUE
-stonedb-query-threads 0
-stonedb-refresh-sys-stonedb TRUE
-stonedb-result-sender-rows 65536
-stonedb-session-debug-level 3
-stonedb-start-async 0
-stonedb-sync-buffers 0
-stonedb-trigger-error (No default value)
 stored-program-cache 256
 super-read-only FALSE
 symbolic-links FALSE
@@ -1769,6 +1712,63 @@ tc-heuristic-recover OFF
 thread-cache-size 9
 thread-handling one-thread-per-connection
 thread-stack 262144
+tianmu-async-join 1;0;0;0
+tianmu-bg-load-threads 0
+tianmu-cachinglevel 1
+tianmu-compensation-start FALSE
+tianmu-control-trace 0
+tianmu-data-distribution-policy space
+tianmu-disk-usage-threshold 85
+tianmu-distinct-cache-size 64
+tianmu-enable-histogram-cmap-bloom FALSE
+tianmu-enable-rowstore TRUE
+tianmu-filterevaluation-speedup TRUE
+tianmu-force-hashjoin FALSE
+tianmu-global-debug-level 4
+tianmu-groupby-speedup TRUE
+tianmu-hugefiledir 
+tianmu-index-cache-size 0
+tianmu-index-search TRUE
+tianmu-ini-allowmysqlquerypath 0
+tianmu-ini-cachefolder cache
+tianmu-ini-cachereleasethreshold 100
+tianmu-ini-cachesizethreshold 4
+tianmu-ini-controlquerylog 1
+tianmu-ini-knlevel 99
+tianmu-ini-pushdown TRUE
+tianmu-ini-servermainheapsize 0
+tianmu-ini-threadpoolsize 1
+tianmu-ini-usemysqlimportexportdefaults FALSE
+tianmu-insert-buffer-size 512
+tianmu-insert-cntthreshold 2
+tianmu-insert-delayed TRUE
+tianmu-insert-max-buffered 65536
+tianmu-insert-numthreshold 10000
+tianmu-insert-wait-ms 100
+tianmu-insert-wait-time 1000
+tianmu-join-disable-switch-side FALSE
+tianmu-join-parallel 1
+tianmu-join-splitrows 0
+tianmu-load-threads 0
+tianmu-lookup-max-size 100000
+tianmu-max-execution-time 0
+tianmu-minmax-speedup TRUE
+tianmu-mm-hardlimit 0
+tianmu-mm-largetemppool-threshold 16
+tianmu-mm-largetempratio 0
+tianmu-mm-policy 
+tianmu-mm-releasepolicy 2q
+tianmu-orderby-speedup FALSE
+tianmu-parallel-filloutput TRUE
+tianmu-parallel-mapjoin FALSE
+tianmu-qps-log TRUE
+tianmu-query-threads 0
+tianmu-refresh-sys-tianmu TRUE
+tianmu-result-sender-rows 65536
+tianmu-session-debug-level 3
+tianmu-start-async 0
+tianmu-sync-buffers 0
+tianmu-trigger-error (No default value)
 time-format %H:%i:%s
 tmp-table-size 16777216
 transaction-alloc-block-size 8192

mysql-test/r/mysqld_daemon.result

@@ -5,5 +5,5 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test

mysql-test/r/mysqldump_bugs.result

@@ -97,9 +97,9 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqll` /*!40100 DEFAULT CHARACTER SET
 
 USE `mysqll`;
 
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `sys_stonedb` /*!40100 DEFAULT CHARACTER SET utf8 */;
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `sys_tianmu` /*!40100 DEFAULT CHARACTER SET utf8 */;
 
-USE `sys_stonedb`;
+USE `sys_tianmu`;
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
 

mysql-test/r/mysqlpump_extended.result

@@ -24,7 +24,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 DROP DATABASE db2_extended;
 # test exclude-events
@@ -180,7 +180,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 DROP DATABASE db2_extended;
 DROP DATABASE db4_extended;

mysql-test/r/mysqlslap.result

@@ -238,7 +238,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 # 'bug58090' database should be present.
 SHOW DATABASES;
@@ -250,7 +250,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 DROP DATABASE bug58090;
 #

mysql-test/r/opt_costmodel_downgrade.result

@@ -41,10 +41,10 @@ mysql.user                                         OK
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 SELECT * FROM mysql.server_cost;
 cost_name	cost_value	last_update	comment
 disk_temptable_create_cost	NULL	#	NULL

mysql-test/r/wl6219-upgrade.result

@@ -262,10 +262,10 @@ mysql.user                                         OK
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 test.t1
 warning  : Table is marked as crashed
 Warning  : Found incompatible YEAR(x) field 'y2' in t1; Please do "ALTER TABLE `t1` FORCE" to fix it!

mysql-test/r/wl6443_deprecation.result

@@ -144,10 +144,10 @@ mysql.user                                         OK
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 drop table mysql.host;
 create view mysql.host as select HOST from mysql.db;
 create user 'wl6443_u1'@'10.10.10.1' identified by 'sql';
@@ -188,10 +188,10 @@ mysql.user                                         OK
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 drop view mysql.host;
 drop user 'wl6443_u1'@'10.10.10.1';
 mysql.columns_priv                                 OK
@@ -228,10 +228,10 @@ mysql.user                                         OK
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 # End of 5.6 tests
 #
 # WL#6802: Deprecate the INFORMATION_SCHEMA.PROFILING table

mysql-test/suite/funcs_1/r/is_columns_mysql.result

@@ -74,7 +74,7 @@ def	mysql	general_log	thread_id	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	b
 def	mysql	general_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references		
 def	mysql	gtid_executed	interval_end	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)			select,insert,update,references	Last number of interval.	
 def	mysql	gtid_executed	interval_start	2	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	NULL	bigint(20)	PRI		select,insert,update,references	First number of interval.	
-def	mysql	gtid_executed	source_uuid	1	NULL	NO	char	36	144	NULL	NULL	NULL	utf8mb4	utf8mb4_general_ci	char(36)	PRI		select,insert,update,references	uuid of the source where the transaction was originally executed.	
+def	mysql	gtid_executed	source_uuid	1	NULL	NO	char	36	108	NULL	NULL	NULL	utf8	utf8_general_ci	char(36)	PRI		select,insert,update,references	uuid of the source where the transaction was originally executed.	
 def	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references		
 def	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references		
 def	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	NULL	smallint(5) unsigned			select,insert,update,references		
@@ -105,10 +105,10 @@ def	mysql	innodb_table_stats	sum_of_other_index_sizes	6	NULL	NO	bigint	NULL	NULL
 def	mysql	innodb_table_stats	table_name	2	NULL	NO	varchar	199	597	NULL	NULL	NULL	utf8	utf8_bin	varchar(199)	PRI		select,insert,update,references		
 def	mysql	ndb_binlog_index	deletes	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
 def	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references		
-def	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	1020	NULL	NULL	NULL	utf8mb4	utf8mb4_general_ci	varchar(255)			select,insert,update,references		
+def	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	765	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references		
 def	mysql	ndb_binlog_index	gci	10	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
 def	mysql	ndb_binlog_index	inserts	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned			select,insert,update,references		
-def	mysql	ndb_binlog_index	next_file	12	NULL	NO	varchar	255	1020	NULL	NULL	NULL	utf8mb4	utf8mb4_general_ci	varchar(255)			select,insert,update,references		
+def	mysql	ndb_binlog_index	next_file	12	NULL	NO	varchar	255	765	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references		
 def	mysql	ndb_binlog_index	next_position	11	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned			select,insert,update,references		
 def	mysql	ndb_binlog_index	orig_epoch	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references		
 def	mysql	ndb_binlog_index	orig_server_id	8	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(10) unsigned	PRI		select,insert,update,references		
@@ -328,8 +328,6 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 3.0000	enum	utf8	utf8_general_ci
 3.0000	set	utf8	utf8_general_ci
 3.0000	varchar	utf8	utf8_general_ci
-4.0000	char	utf8mb4	utf8mb4_general_ci
-4.0000	varchar	utf8mb4	utf8mb4_general_ci
 SELECT DISTINCT
 CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
 DATA_TYPE,
@@ -431,7 +429,7 @@ NULL	mysql	general_log	thread_id	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 NULL	mysql	general_log	server_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	general_log	command_type	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	mysql	general_log	argument	mediumblob	16777215	16777215	NULL	NULL	mediumblob
-4.0000	mysql	gtid_executed	source_uuid	char	36	144	utf8mb4	utf8mb4_general_ci	char(36)
+3.0000	mysql	gtid_executed	source_uuid	char	36	108	utf8	utf8_general_ci	char(36)
 NULL	mysql	gtid_executed	interval_start	bigint	NULL	NULL	NULL	NULL	bigint(20)
 NULL	mysql	gtid_executed	interval_end	bigint	NULL	NULL	NULL	NULL	bigint(20)
 NULL	mysql	help_category	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
@@ -463,7 +461,7 @@ NULL	mysql	innodb_table_stats	n_rows	bigint	NULL	NULL	NULL	NULL	bigint(20) unsig
 NULL	mysql	innodb_table_stats	clustered_index_size	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	mysql	innodb_table_stats	sum_of_other_index_sizes	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	mysql	ndb_binlog_index	Position	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-4.0000	mysql	ndb_binlog_index	File	varchar	255	1020	utf8mb4	utf8mb4_general_ci	varchar(255)
+3.0000	mysql	ndb_binlog_index	File	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 NULL	mysql	ndb_binlog_index	epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	mysql	ndb_binlog_index	inserts	int	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	mysql	ndb_binlog_index	updates	int	NULL	NULL	NULL	NULL	int(10) unsigned
@@ -473,7 +471,7 @@ NULL	mysql	ndb_binlog_index	orig_server_id	int	NULL	NULL	NULL	NULL	int(10) unsig
 NULL	mysql	ndb_binlog_index	orig_epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
 NULL	mysql	ndb_binlog_index	gci	int	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	mysql	ndb_binlog_index	next_position	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
-4.0000	mysql	ndb_binlog_index	next_file	varchar	255	1020	utf8mb4	utf8mb4_general_ci	varchar(255)
+3.0000	mysql	ndb_binlog_index	next_file	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 3.0000	mysql	plugin	name	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	mysql	plugin	dl	varchar	128	384	utf8	utf8_general_ci	varchar(128)
 3.0000	mysql	proc	db	char	64	192	utf8	utf8_bin	char(64)

mysql-test/suite/funcs_1/r/is_schemata.result

@@ -59,7 +59,7 @@ def	mtr	NULL
 def	mysql	NULL
 def	performance_schema	NULL
 def	sys	NULL
-def	sys_stonedb	NULL
+def	sys_tianmu	NULL
 def	test	NULL
 ###############################################################################
 # Testcases 3.2.9.2+3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information

mysql-test/suite/funcs_1/r/is_tables_mysql.result

@@ -167,7 +167,7 @@ AUTO_INCREMENT	NULL
 CREATE_TIME	#CRT#
 UPDATE_TIME	#UT#
 CHECK_TIME	#CT#
-TABLE_COLLATION	utf8mb4_general_ci
+TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
 TABLE_COMMENT	#TC#
@@ -328,7 +328,7 @@ AUTO_INCREMENT	NULL
 CREATE_TIME	#CRT#
 UPDATE_TIME	#UT#
 CHECK_TIME	#CT#
-TABLE_COLLATION	utf8mb4_general_ci
+TABLE_COLLATION	utf8_general_ci
 CHECKSUM	NULL
 CREATE_OPTIONS	#CO#
 TABLE_COMMENT	#TC#

mysql-test/suite/funcs_1/r/is_triggers.result

@@ -105,8 +105,8 @@ WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
 OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
 OR action_reference_new_table IS NOT NULL;
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
-def	mtr	gs_insert	INSERT	def	mtr	global_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SELECT "" REGEXP NEW.pattern INTO dummy; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#		root@localhost	latin1	latin1_swedish_ci	utf8mb4_general_ci
-def	mtr	ts_insert	INSERT	def	mtr	test_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SELECT "" REGEXP NEW.pattern INTO dummy; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#		root@localhost	latin1	latin1_swedish_ci	utf8mb4_general_ci
+def	mtr	gs_insert	INSERT	def	mtr	global_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SELECT "" REGEXP NEW.pattern INTO dummy; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#		root@localhost	latin1	latin1_swedish_ci	utf8_general_ci
+def	mtr	ts_insert	INSERT	def	mtr	test_suppressions	1	NULL	BEGIN   DECLARE dummy INT;   SELECT "" REGEXP NEW.pattern INTO dummy; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#		root@localhost	latin1	latin1_swedish_ci	utf8_general_ci
 def	sys	sys_config_insert_set_user	INSERT	def	sys	sys_config	1	NULL	BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#		mysql.sys@localhost	utf8	utf8_general_ci	utf8_general_ci
 def	sys	sys_config_update_set_user	UPDATE	def	sys	sys_config	1	NULL	BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END	ROW	BEFORE	NULL	NULL	OLD	NEW	#		mysql.sys@localhost	utf8	utf8_general_ci	utf8_general_ci
 ##################################################################################

mysql-test/suite/innodb/r/innodb-wl5980-linux.result

@@ -279,10 +279,10 @@ mysql_upgrade: [ERROR] 1033: Incorrect information in file: './performance_schem
 mysql_upgrade: [ERROR] 1146: Table 'sys.processlist' doesn't exist
 mysql_upgrade: [ERROR] 1146: Table 'sys.x$processlist' doesn't exist
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 test.emp1                                          OK
 test.emp2
 error    : Partitioning upgrade required. Please dump/reload to fix it or do: ALTER TABLE `test`.`emp2` UPGRADE PARTITIONING

mysql-test/suite/innodb/r/log_file.result

@@ -14,7 +14,7 @@ my_restart.err
 # Backup tmp/logfile/*
 # 1. With ibdata2, Without ibdata1
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -36,7 +36,7 @@ undo002
 undo003
 # 2. With ibdata1, without ibdata2
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -59,7 +59,7 @@ undo002
 undo003
 # 3. Without ibdata1 & ibdata2
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -79,7 +79,7 @@ undo001
 undo002
 undo003
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -100,7 +100,7 @@ undo002
 undo003
 # 4. Without ibdata*, ib_logfile* and with undo00*
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -117,7 +117,7 @@ undo001
 undo002
 undo003
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -135,7 +135,7 @@ undo002
 undo003
 # 5. Without ibdata*,ib_logfile* files & Without undo002
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -151,7 +151,7 @@ my_restart.err
 undo001
 undo003
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -168,7 +168,7 @@ undo001
 undo003
 # 6. Without ibdata*,ib_logfile* files & Without undo001, undo002
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -183,7 +183,7 @@ my.cnf
 my_restart.err
 undo003
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -199,7 +199,7 @@ my_restart.err
 undo003
 # 7. With ibdata files & Without undo002
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -220,7 +220,7 @@ my_restart.err
 undo001
 undo003
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -242,7 +242,7 @@ undo001
 undo003
 # 8. With ibdata files & Without undo001, undo002
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -262,7 +262,7 @@ my.cnf
 my_restart.err
 undo003
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -283,7 +283,7 @@ my_restart.err
 undo003
 # 9. Without ibdata*, without undo*, Without ib_logfile1 and with ib_logfile2
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -299,7 +299,7 @@ ib_logfile2
 my.cnf
 my_restart.err
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -316,7 +316,7 @@ my.cnf
 my_restart.err
 # 11. With ibdata*, without ib_logfile1
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -337,7 +337,7 @@ undo001
 undo002
 undo003
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -359,7 +359,7 @@ undo002
 undo003
 # 12. With ibdata*, without ib_logfile2
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2
@@ -381,7 +381,7 @@ undo002
 undo003
 # Cleanup
 .index
-STONEDB_INSERT_BUFFER
+TIANMU_INSERT_BUFFER
 bak_ib_logfile0
 bak_ib_logfile1
 bak_ib_logfile2

mysql-test/suite/innodb/r/partition-upgrade.result

@@ -123,10 +123,10 @@ mysql.user                                         OK
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 test.t575                                          OK
 # Flush the table data files
 FLUSH TABLE t575 FOR EXPORT;
@@ -210,10 +210,10 @@ mysql.user                                         OK
 mtr.global_suppressions                            OK
 mtr.test_suppressions                              OK
 sys.sys_config                                     OK
-sys_stonedb.column_ttl                             OK
-sys_stonedb.columns                                OK
-sys_stonedb.decomposition_dictionary               OK
-sys_stonedb.logs                                   OK
+sys_tianmu.column_ttl                              OK
+sys_tianmu.columns                                 OK
+sys_tianmu.decomposition_dictionary                OK
+sys_tianmu.logs                                    OK
 test.t575
 error    : Partitioning upgrade required. Please dump/reload to fix it or do: ALTER TABLE `test`.`t575` UPGRADE PARTITIONING
 warning  : The partition engine, used by table 'test.t575', is deprecated and will be removed in a future release. Please use native partitioning instead.

mysql-test/suite/innodb_fts/include/ngram.inc

@@ -24,6 +24,22 @@ EVAL CREATE TABLE articles (
         FULLTEXT KEY con3 (k2) WITH PARSER ngram
         ) ENGINE=InnoDB $table_row_format;
 
+EVAL CREATE TABLE 名字 (
+        seq INT AUTO_INCREMENT NOT NULL PRIMARY KEY,
+        c1 VARCHAR(200) CHARACTER SET big5 COLLATE big5_chinese_ci,
+        c2 CHAR(200) CHARACTER SET gbk COLLATE gbk_chinese_ci,
+        c3 CHAR(200) CHARACTER SET utf8,
+        さようなら TEXT CHARACTER SET ujis COLLATE ujis_japanese_ci,
+        j2 VARCHAR(200) CHARACTER SET sjis COLLATE sjis_japanese_ci,
+        j3 VARCHAR(200) CHARACTER SET ujis,
+        행운을빈다 CHAR(200) CHARACTER SET euckr COLLATE euckr_korean_ci,
+        k2 CHAR(200) CHARACTER SET utf8,
+        e1 CHAR(200) CHARACTER SET latin1,
+        FULLTEXT KEY con1 (c1) WITH PARSER ngram,
+        FULLTEXT KEY con2 (さようなら,j3) WITH PARSER ngram,
+        FULLTEXT KEY con3 (k2) WITH PARSER ngram
+        ) ENGINE=InnoDB $table_row_format;
+
 
 SET SESSION innodb_ft_enable_stopword=0;
 --echo # Case : run ngram on english text.
@@ -296,3 +312,315 @@ SELECT * FROM articles;
 
 DROP TABLE articles;
 
+
+-- echo # Test Case : CJK charset and collation with globalized table, column names
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('歡迎','你好','喂 ','日の長','言も言わずに','つやってみよう','제가 미국인입니다.','한국말을 공부합니다%','testing row'),
+   ('你好嗎?','我幾好，你呢','好耐冇見','左右','左右される','☆右折⇔左折','제 이름은 Charles입니다.','운동을 좋아해요*','row value'),
+   ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
+
+-- disable_result_log
+ANALYZE TABLE 名字;
+-- enable_result_log
+
+SELECT * FROM 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con4 (c3) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con5 (c2) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con6 (j2) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con7 (j3) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con9 (e1) WITH PARSER ngram;
+SELECT * FROM 名字 WHERE
+        MATCH(c1) AGAINST('命啊');
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('やっ');
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('제가');
+SELECT * FROM 名字 WHERE
+        MATCH(e1) AGAINST('row');
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST("-我幾 火啊" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j2) AGAINST("やっ-(そう)" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST("니다 -제가" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(e1) AGAINST("row -row1" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST('"我幾 火啊"@3' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('"降り やっ"@4' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('"분은 어를"@2' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(e1) AGAINST('"row row"@1' IN BOOLEAN MODE);
+
+EVAL CREATE TABLE tmp1 $table_row_format AS SELECT * FROM 名字 WHERE 1=2;
+DROP TABLE 名字;
+RENAME TABLE tmp1 TO 名字;
+SHOW CREATE TABLE 名字;
+
+
+-- echo # Test Case : CJK charset and collation with  FTS + transactional statements
+SELECT * FROM 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con1 (c1) WITH PARSER ngram;
+SHOW CREATE TABLE 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con2 (さようなら,j3) WITH PARSER ngram;
+SHOW CREATE TABLE 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con3 (k2) WITH PARSER ngram;
+SHOW CREATE TABLE 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con4 (c3) WITH PARSER ngram;
+SHOW CREATE TABLE 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con5 (c2) WITH PARSER ngram;
+SHOW CREATE TABLE 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con6 (j2) WITH PARSER ngram;
+SHOW CREATE TABLE 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con7 (j3) WITH PARSER ngram;
+SHOW CREATE TABLE 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
+SHOW CREATE TABLE 名字;
+
+START TRANSACTION;
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('歡迎','你好','喂 ','日の長','言も言わずに','つやってみよう','제가 미국인입니다.','한국말을 공부합니다%','testing row'),
+   ('你好嗎?','我幾好，你呢','好耐冇見','左右','左右される','☆右折⇔左折','제 이름은 Charles입니다.','운동을 좋아해요*','row value'),
+   ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
+
+SELECT * FROM 名字 WHERE
+        MATCH(c1) AGAINST('命啊');
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('やっ');
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('제가');
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST("-我幾 火啊" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j2) AGAINST("やっ-(そう)" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST("니다 -제가" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST('"我幾 火啊"@3' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('"降り やっ"@4' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('"분은 어를"@2' IN BOOLEAN MODE);
+COMMIT;
+
+-- disable_result_log
+ANALYZE TABLE 名字;
+-- enable_result_log
+
+SELECT * FROM 名字 WHERE
+        MATCH(c1) AGAINST('命啊');
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('やっ');
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('제가');
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST("-我幾 火啊" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j2) AGAINST("やっ-(そう)" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST("니다 -제가" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST('"我幾 火啊"@3' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('"降り やっ"@4' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('"분은 어를"@2' IN BOOLEAN MODE);
+DELETE FROM 名字;
+START TRANSACTION;
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('歡迎','你好','喂 ','日の長','言も言わずに','つやってみよう','제가 미국인입니다.','한국말을 공부합니다%','testing row');
+SAVEPOINT A;
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('你好嗎?','我幾好，你呢','好耐冇見','左右','左右される','☆右折⇔左折','제 이름은 Charles입니다.','운동을 좋아해요*','row value');
+SAVEPOINT B;
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
+
+SELECT * FROM 名字 WHERE
+        MATCH(c1) AGAINST('命啊');
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('やっ');
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('제가');
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST("-我幾 火啊" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j2) AGAINST("やっ-(そう)" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST("니다 -제가" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST('"我幾 火啊"@3' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('"降り やっ"@4' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('"분은 어를"@2' IN BOOLEAN MODE);
+ROLLBACK TO B;
+COMMIT;
+
+SELECT * FROM 名字 WHERE
+        MATCH(c1) AGAINST('啊! ');
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('やっ');
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('제가');
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST("-我幾 火啊" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j2) AGAINST("やっ-(そう)" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST("니다 -제가" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST('"我幾 火啊"@3' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('"降り やっ"@4' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('"분은 어를"@2' IN BOOLEAN MODE);
+
+DELETE FROM 名字;
+START TRANSACTION;
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('歡迎','你好','喂 ','日の長','言も言わずに','つやってみよう','제가 미국인입니다.','한국말을 공부합니다%','testing row');
+SAVEPOINT A;
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('你好嗎?','我幾好，你呢','好耐冇見','左右','左右される','☆右折⇔左折','제 이름은 Charles입니다.','운동을 좋아해요*','row value');
+SAVEPOINT B;
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
+ROLLBACK;
+COMMIT;
+
+-- disable_result_log
+ANALYZE TABLE 名字;
+-- enable_result_log
+
+SELECT * FROM 名字 WHERE
+        MATCH(c1) AGAINST('命啊');
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('やっ');
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('제가');
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST("-我幾 火啊" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j2) AGAINST("やっ-(そう)" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST("니다 -제가" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST('"我幾 火啊"@3' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('"降り やっ"@4' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('"분은 어를"@2' IN BOOLEAN MODE);
+
+EVAL CREATE TABLE tmp1 $table_row_format AS SELECT * FROM 名字 WHERE 1=2;
+DROP TABLE 名字;
+RENAME TABLE tmp1 TO 名字;
+SHOW CREATE TABLE 名字;
+
+ALTER TABLE 名字 ADD FULLTEXT INDEX con1 (c1) WITH PARSER ngram;
+SHOW CREATE TABLE 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con2 (さようなら,j3) WITH PARSER ngram;
+SHOW CREATE TABLE 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con3 (k2) WITH PARSER ngram;
+SHOW CREATE TABLE 名字;
+
+SELECT * FROM 名字;
+START TRANSACTION;
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('歡迎','你好','喂 ','日の長','言も言わずに','つやってみよう','제가 미국인입니다.','한국말을 공부합니다%','testing row');
+SAVEPOINT A;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con5 (c2) WITH PARSER ngram;
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('你好嗎?','我幾好，你呢','好耐冇見','左右','左右される','☆右折⇔左折','제 이름은 Charles입니다.','운동을 좋아해요*','row value');
+ALTER TABLE 名字 ADD FULLTEXT INDEX con4 (c3) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con6 (j2) WITH PARSER ngram;
+SAVEPOINT B;
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
+ALTER TABLE 名字 ADD FULLTEXT INDEX con7 (j3) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
+COMMIT;
+
+-- disable_result_log
+ANALYZE TABLE 名字;
+-- enable_result_log
+
+SELECT * FROM 名字 WHERE
+        MATCH(c1) AGAINST('命啊');
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('やっ');
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('제가');
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST("-我幾 火啊" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j2) AGAINST("やっ-(そう)" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(j3) AGAINST(">の長" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST("니다 -제가" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(c2) AGAINST('"我幾 火啊"@3' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('"降り やっ"@4' IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(행운을빈다) AGAINST('"분은 어를"@2' IN BOOLEAN MODE);
+
+EVAL CREATE TABLE tmp1 $table_row_format AS SELECT * FROM 名字 WHERE 1=2;
+DROP TABLE 名字;
+RENAME TABLE tmp1 TO 名字;
+SHOW CREATE TABLE 名字;
+
+-- echo # Test Case : CJK charset and collation , FTS query in condition of update/delete
+
+SELECT * FROM 名字;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con1 (c1) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con2 (さようなら,j3) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con3 (k2) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con4 (c3) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con5 (c2) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con6 (j2) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con7 (j3) WITH PARSER ngram;
+ALTER TABLE 名字 ADD FULLTEXT INDEX con8 (행운을빈다) WITH PARSER ngram;
+
+INSERT INTO 名字 (c1,c2,c3,さようなら,j2,j3,행운을빈다,k2,e1) VALUES
+   ('歡迎','你好','喂 ','日の長','言も言わずに','つやってみよう','제가 미국인입니다.','한국말을 공부합니다%','testing row'),
+   ('你好嗎?','我幾好，你呢','好耐冇見','左右','左右される','☆右折⇔左折','제 이름은 Charles입니다.','운동을 좋아해요*','row value'),
+   ('救命啊!','火啊! 你好','生日快樂 ','雨季','雨が降りそう つやってみよう','雨雲','저분은 영어를 잘 합니다','저는 서울에서 살고 있습니다.','recording test');
+
+-- disable_result_log
+ANALYZE TABLE 名字;
+-- enable_result_log
+
+SELECT * FROM 名字 WHERE
+        MATCH(c1) AGAINST('命啊');
+UPDATE 名字 SET c1 = '你好嗎?' WHERE MATCH(c2) AGAINST('啊!');
+SELECT * FROM 名字 WHERE
+        MATCH(c1) AGAINST('命啊');
+DELETE FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST("てみ -雨が" IN BOOLEAN MODE);
+SELECT * FROM 名字 WHERE
+        MATCH(さようなら,j3) AGAINST('てみ');
+SELECT * FROM 名字;
+SELECT * FROM 名字 WHERE
+        MATCH (행운을빈다) AGAINST('니다');
+DELETE FROM 名字 WHERE
+        MATCH (행운을빈다) AGAINST('니다');
+SELECT * FROM 名字;
+
+DROP TABLE 名字;

mysql-test/suite/perfschema/r/binlog_edge_mix.result

@@ -110,7 +110,7 @@ include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	drop database if exists my_replicated_db
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_utf8mb4'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'utf8mb4_general_ci'))
+master-bin.000001	#	Query	#	#	use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_utf8'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'utf8_general_ci'))
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	create database my_replicated_db
 master-bin.000001	#	Query	#	#	use `test`; create table my_replicated_db.my_tx_table(a bigint) engine = innodb

mysql-test/suite/perfschema/r/binlog_edge_stmt.result

@@ -146,7 +146,7 @@ include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	drop database if exists my_replicated_db
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_utf8mb4'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'utf8mb4_general_ci'))
+master-bin.000001	#	Query	#	#	use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_utf8'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'utf8_general_ci'))
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	create database my_replicated_db
 master-bin.000001	#	Query	#	#	use `test`; create table my_replicated_db.my_tx_table(a bigint) engine = innodb

mysql-test/suite/perfschema/r/max_program_zero.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_disable_idle.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_disable_stages.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_disable_statements.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_disable_transactions.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_disable_waits.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_innodb.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_low_index.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_low_table_lock.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_account.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_cond_class.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_cond_inst.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_file_class.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_file_inst.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_host.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_index.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_mdl.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_memory_class.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_mutex_class.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_setup_actors.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_setup_objects.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_socket_class.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_socket_inst.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_stage_class.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_stages_history.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_statement_class.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_statements_history.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_table_hdl.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_table_inst.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_table_lock.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_thread_class.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_thread_inst.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_transactions_history.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_user.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_waits_history.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_nothing.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_off.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/start_server_on.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/suite/perfschema/r/statement_program_lost_inst.result

@@ -6,7 +6,7 @@ mtr
 mysql
 performance_schema
 sys
-sys_stonedb
+sys_tianmu
 test
 select count(*) from performance_schema.performance_timers;
 count(*)

mysql-test/t/mysqlpump_basic.test

@@ -313,7 +313,7 @@ SHOW CREATE VIEW db4_basic.v1;
 SHOW CREATE VIEW db4_basic.v2;
 
 #dump all dbs
---exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_basic.sql
+--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_tianmu,cache > $MYSQLTEST_VARDIR/tmp/db1_basic.sql
 DROP DATABASE db1_basic;
 DROP DATABASE db2_basic;
 DROP DATABASE db3_basic;
@@ -329,7 +329,7 @@ SHOW CREATE VIEW db4_basic.v1;
 SHOW CREATE VIEW db4_basic.v2;
 
 # test with default-parallelism=0
---exec $MYSQL_PUMP --default-parallelism=0 --exclude-databases=mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_basic.sql
+--exec $MYSQL_PUMP --default-parallelism=0 --exclude-databases=mysql,mtr,sys_tianmu,cache > $MYSQLTEST_VARDIR/tmp/db1_basic.sql
 DROP DATABASE db1_basic;
 DROP DATABASE db2_basic;
 DROP DATABASE db3_basic;
@@ -685,7 +685,7 @@ CREATE DEFINER=VIEWUSER@LOCALHOST SQL SECURITY DEFINER VIEW V_T1_B AS SELECT * F
 CREATE SQL SECURITY DEFINER VIEW V_T1_A2 AS SELECT * FROM V_T1_A;
 CREATE SQL SECURITY DEFINER VIEW V_T1_B2 AS SELECT * FROM V_T1_B;
 
---exec $MYSQL_PUMP --exclude-databases=mtr,sys_stonedb,cache --include-users=VIEWUSER@localhost --all-databases --add-drop-table --users > $MYSQLTEST_VARDIR/tmp/bug29023216.sql
+--exec $MYSQL_PUMP --exclude-databases=mtr,sys_tianmu,cache --include-users=VIEWUSER@localhost --all-databases --add-drop-table --users > $MYSQLTEST_VARDIR/tmp/bug29023216.sql
 DROP DATABASE DB29023216;
 DROP USER 'VIEWUSER'@'LOCALHOST';
 # restore should succeed
@@ -702,7 +702,7 @@ SELECT * FROM V_T1_B2;
 CREATE DEFINER=VIEWUSER@LOCALHOST FUNCTION TESTFUNC() RETURNS BOOL RETURN TRUE;
 CREATE VIEW V_T1_C AS SELECT DB29023216.TESTFUNC();
 
---exec $MYSQL_PUMP --exclude-databases=mtr,sys_stonedb,cache --include-users=VIEWUSER@localhost --all-databases --add-drop-table --users > $MYSQLTEST_VARDIR/tmp/bug29023216.sql
+--exec $MYSQL_PUMP --exclude-databases=mtr,sys_tianmu,cache --include-users=VIEWUSER@localhost --all-databases --add-drop-table --users > $MYSQLTEST_VARDIR/tmp/bug29023216.sql
 DROP DATABASE DB29023216;
 DROP USER 'VIEWUSER'@'LOCALHOST';
 # restore should succeed

mysql-test/t/mysqlpump_bugs.test

@@ -12,7 +12,7 @@ EOF
 CREATE DATABASE db1;
 CREATE DATABASE db2;
 
---exec $MYSQLPUMP --defaults-extra-file=$MYSQLTEST_VARDIR/tmp/bug83144.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot --exclude-databases=mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/bug83144.dump
+--exec $MYSQLPUMP --defaults-extra-file=$MYSQLTEST_VARDIR/tmp/bug83144.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT -uroot --exclude-databases=mtr,sys_tianmu,cache > $MYSQLTEST_VARDIR/tmp/bug83144.dump
 
 DROP DATABASE db1;
 DROP DATABASE db2;

mysql-test/t/mysqlpump_extended.test

@@ -20,7 +20,7 @@ CREATE TABLE t1 (a INT);
 CREATE TABLE t2 (a INT, b VARCHAR(10), primary key(a));
 
 --echo # test exclude-databases
---exec $MYSQL_PUMP --add-drop-table --exclude-databases=db1_extended,mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
+--exec $MYSQL_PUMP --add-drop-table --exclude-databases=db1_extended,mysql,mtr,sys_tianmu,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 DROP DATABASE db2_extended;
 DROP DATABASE db1_extended;
 --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/db1_extended.sql
@@ -208,7 +208,7 @@ USE db4_extended;
 CREATE TABLE t1 (a INT);
 CREATE TABLE t2 (a INT, b VARCHAR(10), primary key(a));
 
---exec $MYSQL_PUMP --parallel-schemas=db2_extended,db4_extended --exclude-databases=db1_extended,db3_extended,mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
+--exec $MYSQL_PUMP --parallel-schemas=db2_extended,db4_extended --exclude-databases=db1_extended,db3_extended,mysql,mtr,sys_tianmu,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 
 DROP DATABASE db1_extended;
 DROP DATABASE db2_extended;
@@ -250,7 +250,7 @@ DROP DATABASE db1_extended;
 
 CREATE USER u1@localhost IDENTIFIED BY 'abc';
 CREATE USER u2;
---exec $MYSQL_PUMP --users --exclude-users=root,mysql.sys,mysql.session --exclude-databases=mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
+--exec $MYSQL_PUMP --users --exclude-users=root,mysql.sys,mysql.session --exclude-databases=mysql,mtr,sys_tianmu,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 DROP USER u1@localhost,u2;
 --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 --remove_file $MYSQLTEST_VARDIR/tmp/db1_extended.sql
@@ -268,7 +268,7 @@ CREATE USER u2;
 CREATE USER u3@120.0.0.1;
 GRANT SELECT ON mysql.user to u3@120.0.0.1;
 
---exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache --include-users=u2,u1@120.0.0.1 > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
+--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_tianmu,cache --include-users=u2,u1@120.0.0.1 > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 DROP USER u1@localhost,u3@120.0.0.1,u1@120.0.0.1,u2;
 --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 --remove_file $MYSQLTEST_VARDIR/tmp/db1_extended.sql
@@ -287,7 +287,7 @@ CREATE USER u2;
 CREATE USER u3@120.0.0.1;
 GRANT SELECT ON mysql.user to u3@120.0.0.1;
 
---exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache --exclude-users=u2,u1@120.0.0.1,root,mysql.sys,mysql.session > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
+--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_tianmu,cache --exclude-users=u2,u1@120.0.0.1,root,mysql.sys,mysql.session > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 DROP USER u1@localhost,u3@120.0.0.1,u1@120.0.0.1,u2;
 --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 --remove_file $MYSQLTEST_VARDIR/tmp/db1_extended.sql
@@ -299,7 +299,7 @@ DROP USER u1@localhost,u3@120.0.0.1;
 --echo # test add-drop-user
 
 CREATE USER u1@localhost IDENTIFIED BY 'abc';
---exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache --exclude-users=root,mysql.sys,mysql.session --add-drop-user > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
+--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_tianmu,cache --exclude-users=root,mysql.sys,mysql.session --add-drop-user > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 DROP USER u1@localhost;
 # if restore reports error it means db1_extended.sql has DROP USER stmt
 --error 1
@@ -322,7 +322,7 @@ CREATE DEFINER = u1@localhost VIEW v2 AS SELECT t1.a as X, t2.* FROM t1,t2 ORDER
 CREATE DEFINER = u1@localhost VIEW definer_name_view AS SELECT * FROM t1 union SELECT a FROM t2;
 
 #test without skip-definer
---exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
+--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_tianmu,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 
 DROP DATABASE db1_extended;
 # now restore and check for view definitions
@@ -334,7 +334,7 @@ SHOW CREATE VIEW db1_extended.v2;
 SHOW CREATE VIEW db1_extended.definer_name_view;
 
 #test with skip-definer
---exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache --skip-definer > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
+--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_tianmu,cache --skip-definer > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 
 DROP DATABASE db1_extended;
 # now restore and check for view definitions
@@ -388,7 +388,7 @@ CREATE DEFINER = u1@localhost PROCEDURE p2(x int)
 DELIMITER ;|
 
 #test without skip-definer
---exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
+--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_tianmu,cache > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 
 DROP DATABASE db1_extended;
 # now restore and check for view definitions
@@ -401,7 +401,7 @@ SHOW CREATE PROCEDURE db1_extended.p1;
 SHOW CREATE PROCEDURE db1_extended.p2;
 
 #test with skip-definer
---exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_stonedb,cache --skip-definer > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
+--exec $MYSQL_PUMP --exclude-databases=mysql,mtr,sys_tianmu,cache --skip-definer > $MYSQLTEST_VARDIR/tmp/db1_extended.sql
 
 DROP DATABASE db1_extended;
 # now restore and check for view definitions