fix(mtr):mtr result stonedb change to tianmu(stoneatom#359) (stoneato…

…m#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: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
davidshiz · Aug 7, 2022 · 83acbca · 83acbca
1 parent f755d2e
commit 83acbca
Show file tree

Hide file tree

Showing 86 changed files with 1,025 additions and 699 deletions.
diff --git a/mysql-test/r/1st.result b/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

diff --git a/mysql-test/r/ctype_gb18030_encoding_cn.result b/mysql-test/r/ctype_gb18030_encoding_cn.result
@@ -12,7 +12,7 @@ information_schema	696E666F726D6174696F6E5F736368656D61
 cache	6361636865
 mysql	6D7973716C
 performance_schema	706572666F726D616E63655F736368656D61
-sys_stonedb	7379735F73746F6E656462
+sys_tianmu	7379735F7469616E6D75
 test	74657374
 USE `���ݿ�`;
 USE `����`;

diff --git a/mysql-test/r/ctype_gb18030_encoding_utf8.result b/mysql-test/r/ctype_gb18030_encoding_utf8.result
@@ -12,7 +12,7 @@ information_schema	696E666F726D6174696F6E5F736368656D61
 cache	6361636865
 mysql	6D7973716C
 performance_schema	706572666F726D616E63655F736368656D61
-sys_stonedb	7379735F73746F6E656462
+sys_tianmu	7379735F7469616E6D75
 test	74657374
 USE `数据库`;
 USE `中文`;

diff --git a/mysql-test/r/drop.result b/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

diff --git a/mysql-test/r/events_grant.result b/mysql-test/r/events_grant.result
diff --git a/mysql-test/r/log_tables_upgrade.result b/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;

diff --git a/mysql-test/r/mysql_config_editor.result b/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.

diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
diff --git a/mysql-test/r/mysql_upgrade_ssl.result b/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;

diff --git a/mysql-test/r/mysql_upgrade_with_session_user.result b/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

diff --git a/mysql-test/r/mysqlcheck.result b/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