# This is a combination of 7 commits.

# This is the 1st commit message: fix(core): Double prepare on lex unit for cts with union(stoneatom#226) fix(core): MTR + Double prepare on lex unit for ctas with union(stoneatom#226) # This is the commit message #2: rich doc to fix env dependence "not found" (stoneatom#316) # This is the commit message #3: fix(mtr): make the mtr passed (stoneatom#315) (stoneatom#317) [summary] How to run: ./mysql-test-run.pl --suite=stonedb --nowarnings --force --nocheck-testcases 1. test cases below are failed, we ignored them first: issue410 issue415 issue433 issue446 issue515 load.test 2. Sys variables next are not set correctly, they should be added to `/mysql-test/include/default_mysqld.cnf`. stonedb_insert_delayed = 0 stonedb_ini_allowmysqlquerypath=1 3.check-testcases: A new MTR option to enforce strict cleanup: https://dev.mysql.com/blog-archive/fail-check-testcases-a-new-mtr-option-to-enforce-strict-cleanup In `mtr` comment: ``` Some options that control enabling a feature for normal test runs, can be turned off by prepending 'no' to the option, e.g. --notimer. This applies to reorder, timer, check-testcases and warnings. ``` Currently we turn off it first to make mtr run success. Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> # This is the commit message #4: feat(stonedb): update the copyright date time (stoneatom#321) (stoneatom#324) # This is the commit message #5: fix(core): fix crash when executing sql. (stoneatom#327) (stoneatom#328) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> # This is the commit message #6: feat(index): Unified class member variable name with google style (stoneatom#311) (stoneatom#312) [summary] Class member name will be like: class TableInfo { ... private: std::string table_name_; // OK - underscore at end. static Pool<TableInfo>* pool_; // OK. }; Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> # This is the commit message #7: fix(mtr):move character_set to test.character_set, fix main mtr_test and innodb mtr_test(stoneatom#277) (stoneatom#335) * fix(mtr):fix innodb mtr and mv some test to test/innodb * fix(mtr):move character_set to test/main/ fix(mtr):mv main mtr character_set test to test/main/cahracter_set fix(mtr):mv myisam error mtr-test to test/main/myisam fix(mtr):add optimizer_switch to include/default_mysqld.cnf * fix(mtr):fix main mtr optimizer_switch amd mv some test to test/main Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
xiaoguangye · Aug 10, 2022 · 5fe392e · 5fe392e
1 parent e58e757
commit 5fe392e
Show file tree

Hide file tree

Showing 117 changed files with 431 additions and 744 deletions.
diff --git a/.github/workflows/integration-compile-mtr.yml b/.github/workflows/integration-compile-mtr.yml
@@ -82,10 +82,10 @@ jobs:
         run: |
           sudo cmake ./ \
           -DCMAKE_BUILD_TYPE=release \
-          -DCMAKE_INSTALL_PREFIX=/stonedb56/install \
-          -DMYSQL_DATADIR=/stonedb56/install/data \
-          -DSYSCONFDIR=/stonedb56/install \
-          -DMYSQL_UNIX_ADDR=/stonedb56/install/tmp/mysql.sock \
+          -DCMAKE_INSTALL_PREFIX=/stonedb57/install \
+          -DMYSQL_DATADIR=/stonedb57/install/data \
+          -DSYSCONFDIR=/stonedb57/install \
+          -DMYSQL_UNIX_ADDR=/stonedb57/install/tmp/mysql.sock \
           -DWITH_EMBEDDED_SERVER=OFF \
           -DWITH_STONEDB_STORAGE_ENGINE=1 \
           -DWITH_MYISAM_STORAGE_ENGINE=1 \
@@ -100,12 +100,9 @@ jobs:
           sudo make VERBOSE=1 -j`nproc`
           sudo make install -j`nproc`
 
-          #- name: mtr test
-          #  run: |
-          #    sudo mkdir -p /stonedb56/install/data/innodb
-          #    sudo mkdir -p /stonedb56/install/binlog
-          #    sudo mkdir -p /stonedb56/install/log
-          #    sudo mkdir -p /stonedb56/install/tmp
-          #    sudo chown -R mysql:mysql /stonedb56
-          #    cd /stonedb56/install/mysql-test
-          #    sudo ./mysql-test-run.pl --suite=stonedb --nowarnings --force
+      - name: mtr test
+        run: |
+          sudo mkdir -p /stonedb57/install/log
+          sudo chown -R mysql:mysql /stonedb57
+          cd /stonedb57/install/mysql-test
+          sudo ./mysql-test-run.pl --suite=stonedb --nowarnings --force --nocheck-testcases
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ build/
 cscope*
 sql/build_info.h
 .vscode
+.idea
 VERSION.dep
 CMakeCache
 CMakeFiles

diff --git a/client/base/help_options.cc b/client/base/help_options.cc
@@ -88,16 +88,16 @@ void Mysql::Tools::Base::Options::Help_options::print_usage()
 
   if (first_year_str == COPYRIGHT_NOTICE_CURRENT_YEAR)
   {
-    copyright= ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_CURRENT_YEAR);
+    copyright= ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR);
   }
   else
   {
 #define FIRST_YEAR_CONSTANT "$first_year$"
     string first_year_constant_str= FIRST_YEAR_CONSTANT;
 
-    copyright= ORACLE_WELCOME_COPYRIGHT_NOTICE(FIRST_YEAR_CONSTANT);
-    copyright= copyright.replace(copyright.find(first_year_constant_str),
-                                 first_year_constant_str.length(), first_year_str);
+    copyright= ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR);
+/*  copyright= copyright.replace(copyright.find(first_year_constant_str),
+                                 first_year_constant_str.length(), first_year_str);*/
   }
 
   printf("%s\n%s\n",

diff --git a/client/check/mysqlcheck.cc b/client/check/mysqlcheck.cc
@@ -246,7 +246,7 @@ static void print_version(void)
 static void usage(void)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("This program can be used to CHECK (-c, -m, -C), REPAIR (-r), ANALYZE (-a),");
   puts("or OPTIMIZE (-o) tables. Some of the options (like -e or -q) can be");
   puts("used at the same time. Not all options are supported by all storage engines.");

diff --git a/client/mysql.cc b/client/mysql.cc
@@ -1363,7 +1363,7 @@ int main(int argc,char *argv[])
 	   mysql_thread_id(&mysql), server_version_string(&mysql));
   put_info((char*) glob_buffer.ptr(),INFO_INFO);
 
-  put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);
+  put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR), INFO_INFO);
 
   if (!status.batch)
   {
@@ -1925,7 +1925,7 @@ static void usage(int version)
 
   if (version)
     return;
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("Usage: %s [OPTIONS] [database]\n", my_progname);
   /*
     Turn default for zombies off so that the help on how to 

diff --git a/client/mysql_config_editor.cc b/client/mysql_config_editor.cc
@@ -1470,7 +1470,7 @@ static void my_perror(const char *msg)
 static void usage_command(int command)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2012"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("MySQL Configuration Utility.");
   printf("\nDescription: %s\n", command_data[command].description);
   printf("Usage: %s [program options] [%s [command options]]\n",
@@ -1483,7 +1483,7 @@ static void usage_command(int command)
 static void usage_program(void)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2012"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("MySQL Configuration Utility.");
   printf("Usage: %s [program options] [command [command options]]\n",
          my_progname);

diff --git a/client/mysql_install_db.cc b/client/mysql_install_db.cc
@@ -329,7 +329,7 @@ void print_version(const string &p)
 void usage(const string &p)
 {
   print_version(p);
-  cout << ORACLE_WELCOME_COPYRIGHT_NOTICE("2015") << endl
+  cout << ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR) << endl
        << "MySQL Database Deployment Utility." << endl
        << "Usage: "
        << p

diff --git a/client/mysql_secure_installation.cc b/client/mysql_secure_installation.cc
@@ -102,7 +102,7 @@ static void print_version(void)
 static void usage()
 {
   print_version();
-  fprintf(stdout, ORACLE_WELCOME_COPYRIGHT_NOTICE("2013"));
+  fprintf(stdout, ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   fprintf(stdout, "\nMySQL Configuration Utility.");
   fprintf(stdout, "Usage: %s [OPTIONS]\n", my_progname);
   my_print_help(my_connection_options);

diff --git a/client/mysql_ssl_rsa_setup.cc b/client/mysql_ssl_rsa_setup.cc
@@ -424,7 +424,7 @@ static
 void usage(void)
 {
   print_version();
-  cout << (ORACLE_WELCOME_COPYRIGHT_NOTICE("2015")) << endl
+  cout << (ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR)) << endl
        << "MySQL SSL Certificate and RSA Key Generation Utility" << endl
        << "Usage : " << my_progname << " [OPTIONS]" << endl;
 

diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
@@ -785,7 +785,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     case ADMIN_VER:
       new_line=1;
       print_version();
-      puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+      puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
       printf("Server version\t\t%s\n", mysql_get_server_info(mysql));
       printf("Protocol version\t%d\n", mysql_get_proto_info(mysql));
       printf("Connection\t\t%s\n",mysql_get_host_info(mysql));
@@ -1279,7 +1279,7 @@ static void print_version(void)
 static void usage(void)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Administration program for the mysqld daemon.");
   printf("Usage: %s [OPTIONS] command command....\n", my_progname);
   /*

diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
@@ -2070,7 +2070,7 @@ static void print_version()
 static void usage()
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("\
 Dumps a MySQL binary log in a format usable for viewing or for piping to\n\
 the mysql command line client.\n\n");

diff --git a/client/mysqldump.c b/client/mysqldump.c
@@ -666,7 +666,7 @@ static void usage(void)
 {
   struct my_option *optp;
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Dumping structure and contents of MySQL databases and tables.");
   short_usage_sub();
 #if defined(STONEDB)

diff --git a/client/mysqlimport.c b/client/mysqlimport.c
@@ -225,7 +225,7 @@ static void usage(void)
 {
   struct my_option *optp;
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("\
 Loads tables from text files in various formats.  The base name of the\n\
 text file must be the name of the table that should be used.\n\

diff --git a/client/mysqlshow.c b/client/mysqlshow.c
@@ -304,7 +304,7 @@ static void usage(void)
 {
   struct my_option *optp;
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Shows the structure of a MySQL database (databases, tables, and columns).\n");
   printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname);
   puts("\n\

diff --git a/client/mysqlslap.cc b/client/mysqlslap.cc
@@ -741,7 +741,7 @@ static void usage(void)
 {
   struct my_option *optp;
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2005"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Run a query multiple times against the server.\n");
   printf("Usage: %s [OPTIONS]\n",my_progname);
   print_defaults("my",load_default_groups);

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
@@ -7200,7 +7200,7 @@ void print_version(void)
 void usage()
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("Runs a test against the mysql server and compares output with a results file.\n\n");
   printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname);
   my_print_help(my_long_options);

diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
@@ -982,7 +982,7 @@ static void print_version(void)
 static void usage(void)
 {
 	print_version();
-	puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+	puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
 	printf("InnoDB offline file checksum utility.\n");
 	printf("Usage: %s [-c] [-s <start page>] [-e <end page>] "
 		"[-p <page>] [-v]  [-a <allow mismatches>] [-n] "

diff --git a/extra/lz4_decompress.cc b/extra/lz4_decompress.cc
@@ -32,7 +32,7 @@ static void usage()
 {
   printf("%s  Ver 1.7 for %s at %s\n","lz4_decompress",SYSTEM_TYPE,
 	 MACHINE_TYPE);
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2015"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Decompress data compressed by mysqlpump using lz4 compression "
     "algorithm by reading from input file and writing uncompressed "
     "data to output file");

diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c
@@ -115,7 +115,7 @@ static void usage(my_bool version)
 	 MACHINE_TYPE);
   if (version)
     return;
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   puts("Prints all arguments that is give to some program using the default files");
   printf("Usage: %s [OPTIONS] groups\n", my_progname);
   my_print_help(my_long_options);

diff --git a/extra/perror.c b/extra/perror.c
@@ -91,7 +91,7 @@ static void print_version(void)
 static void usage(void)
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("Print a description for a system error code or a MySQL error code.\n");
   printf("If you want to get the error for a negative error code, you should use\n-- before the first error code to tell perror that there was no more options.\n\n");
   printf("Usage: %s [OPTIONS] [ERRORCODE [ERRORCODE...]]\n",my_progname);

diff --git a/extra/resolve_stack_dump.cc b/extra/resolve_stack_dump.cc
@@ -88,7 +88,7 @@ static void print_version(void)
 static void usage()
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2001"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE(COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR));
   printf("Resolve numeric stack strace dump into symbols.\n\n");
   printf("Usage: %s [OPTIONS] symbols-file [numeric-dump-file]\n",
 	 my_progname);

diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h
@@ -23,6 +23,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
+#define COPYRIGHT_NOTICE_STONEDB_BEGIN_YEAR "2021"
 #define COPYRIGHT_NOTICE_CURRENT_YEAR "2022"
 
 /*

diff --git a/mysql-test/include/default_mysqld.cnf b/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.
@@ -75,3 +77,5 @@ binlog-direct-non-transactional-updates
 
 loose-show-compatibility-56=ON
 
+stonedb_insert_delayed = 0
+stonedb_ini_allowmysqlquerypath=1
diff --git a/mysql-test/r/mysqld--help-notwin.result b/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

diff --git a/mysql-test/r/mysqld_daemon.result b/mysql-test/r/mysqld_daemon.result
@@ -1,7 +1,9 @@
 Database
 information_schema
+cache
 mtr
 mysql
 performance_schema
 sys
+sys_stonedb
 test
diff --git a/mysql-test/r/mysqld_safe.result b/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
diff --git a/mysql-test/r/mysqldump_bugs.result b/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`;
 

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

diff --git a/mysql-test/suite/innodb/r/innodb-system-table-view.result b/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