Skip to content

Commit

Permalink
# This is a combination of 8 commits.
Browse files Browse the repository at this point in the history
# This is the 1st commit message:

rich doc to fix  env dependence "not found" (stoneatom#316)


# This is the commit message #2:

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 #3:

feat(stonedb): update the copyright date time (stoneatom#321) (stoneatom#324)


# This is the commit message #4:

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 #5:

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 #6:

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>
# This is the commit message #7:

feat(tianmu): stonedb namespace to tianmu (stoneatom#337)

[summary]
1. Change all engine stonedb to tianmu
2. Change SDB to tianmu
3. Also include mysql-test
4. Change file magic number to TianmuTB
# This is the commit message stoneatom#8:

fix bugs of stoneatom#309 and stoneatom#310 (stoneatom#313)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
xiaoguangye and mergify[bot] committed Aug 5, 2022
1 parent cfd1f5a commit 2f07bb2
Show file tree
Hide file tree
Showing 719 changed files with 4,981 additions and 4,967 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration-compile-mtr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ jobs:
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
sudo ./mysql-test-run.pl --suite=tianmu --nowarnings --force --nocheck-testcases
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pull_request_rules:
actions:
comment:
message: |
This pull request's title is not fulfill the requirements. @{{author}} please update it :point_down:.
This pull request's title should follow requirements next. @{{author}} please check it :point_down:.
Valid format:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ INCLUDE(configure.cmake)

# Common defines and includes
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
ADD_DEFINITIONS(-DSTONEDB)
ADD_DEFINITIONS(-DTIANMU)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/include
${CMAKE_SOURCE_DIR}/extra/rapidjson/include
Expand Down
4 changes: 2 additions & 2 deletions client/mysql.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,7 @@ int main(int argc,char *argv[])
#endif

my_getopt_use_args_separator= TRUE;
#if defined(STONEDB)
#if defined(TIANMU)
if (load_defaults(MYSQL_CONFIG_NAME,load_default_groups,&argc,&argv))
#else
if (load_defaults("my",load_default_groups,&argc,&argv))
Expand Down Expand Up @@ -1941,7 +1941,7 @@ static void usage(int version)
}
}
my_print_help(my_long_options);
#if defined(STONEDB)
#if defined(TIANMU)
print_defaults(MYSQL_CONFIG_NAME, load_default_groups);
#else
print_defaults("my", load_default_groups);
Expand Down
4 changes: 2 additions & 2 deletions client/mysqladmin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ int main(int argc,char *argv[])
MY_INIT(argv[0]);
mysql_init(&mysql);
my_getopt_use_args_separator= TRUE;
#if defined(STONEDB)
#if defined(TIANMU)
if (load_defaults(MYSQL_CONFIG_NAME,load_default_groups,&argc,&argv))
#else
if (load_defaults("my",load_default_groups,&argc,&argv))
Expand Down Expand Up @@ -1297,7 +1297,7 @@ static void usage(void)
}
my_print_help(my_long_options);
my_print_variables(my_long_options);
#if defined(STONEDB)
#if defined(TIANMU)
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
#else
print_defaults("my",load_default_groups);
Expand Down
2 changes: 1 addition & 1 deletion client/mysqlbinlog.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3382,7 +3382,7 @@ int main(int argc, char** argv)
buff_ev= new Buff_ev(PSI_NOT_INSTRUMENTED);

my_getopt_use_args_separator= TRUE;
#if defined(STONEDB)
#if defined(TIANMU)
if (load_defaults(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv))
#else
if (load_defaults("my", load_default_groups, &argc, &argv))
Expand Down
4 changes: 2 additions & 2 deletions client/mysqldump.c
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ static void usage(void)
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)
#if defined(TIANMU)
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
#else
print_defaults("my",load_default_groups);
Expand Down Expand Up @@ -1017,7 +1017,7 @@ static int get_options(int *argc, char ***argv)

md_result_file= stdout;
my_getopt_use_args_separator= TRUE;
#if defined(STONEDB)
#if defined(TIANMU)
if (load_defaults(MYSQL_CONFIG_NAME,load_default_groups,argc,argv))
#else
if (load_defaults("my",load_default_groups,argc,argv))
Expand Down
4 changes: 2 additions & 2 deletions client/mysqlimport.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ read the text file directly. In other cases the client will open the text\n\
file. The SQL command 'LOAD DATA INFILE' is used to import the rows.\n");

printf("\nUsage: %s [OPTIONS] database textfile...",my_progname);
#if defined(STONEDB)
#if defined(TIANMU)
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
#else
print_defaults("my",load_default_groups);
Expand Down Expand Up @@ -669,7 +669,7 @@ int main(int argc, char **argv)
MY_INIT(argv[0]);

my_getopt_use_args_separator= TRUE;
#if defined(STONEDB)
#if defined(TIANMU)
if (load_defaults(MYSQL_CONFIG_NAME,load_default_groups,&argc,&argv))
#else
if (load_defaults("my",load_default_groups,&argc,&argv))
Expand Down
4 changes: 2 additions & 2 deletions client/mysqlshow.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ int main(int argc, char **argv)
MY_INIT(argv[0]);

my_getopt_use_args_separator= TRUE;
#if defined(STONEDB)
#if defined(TIANMU)
if (load_defaults(MYSQL_CONFIG_NAME,load_default_groups,&argc,&argv))
#else
if (load_defaults("my",load_default_groups,&argc,&argv))
Expand Down Expand Up @@ -314,7 +314,7 @@ If no database is given then all matching databases are shown.\n\
If no table is given, then all matching tables in database are shown.\n\
If no column is given, then all matching columns and column types in table\n\
are shown.");
#if defined(STONEDB)
#if defined(TIANMU)
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
#else
print_defaults("my",load_default_groups);
Expand Down
2 changes: 1 addition & 1 deletion client/mysqltest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7362,7 +7362,7 @@ get_one_option(int optid, const struct my_option *opt, char *argument)

int parse_args(int argc, char **argv)
{
#if defined(STONEDB)
#if defined(TIANMU)
if (load_defaults(MYSQL_CONFIG_NAME,load_default_groups,&argc,&argv))
#else
if (load_defaults("my",load_default_groups,&argc,&argv))
Expand Down
2 changes: 1 addition & 1 deletion include/my_global.h
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ typedef char my_bool; /* Small bool */
/* Macros for converting *constants* to the right type */
#define MYF(v) (myf) (v)

//STONEDB UPGRADE
//TIANMU UPGRADE
#ifndef USING_X
#define reg1 register
#endif
Expand Down
2 changes: 1 addition & 1 deletion install_scripts/my.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ loose-performance-schema-consumer-thread-instrumentation=ON

binlog-direct-non-transactional-updates

default-storage-engine=stonedb
default-storage-engine=tianmu
#use_stat_tables=preferably

# here, at the end of [mysqld] group mtr will automatically disable
Expand Down
2 changes: 1 addition & 1 deletion libmysqld/lib_sql.cc
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ int init_embedded_server(int argc, char **argv, char **groups)

orig_argc= *argcp;
orig_argv= *argvp;
#if defined(STONEDB)
#if defined(TIANMU)
if (load_defaults(MYSQL_CONFIG_NAME, (const char **)groups, argcp, argvp))
#else
if (load_defaults("my", (const char **)groups, argcp, argvp))
Expand Down
2 changes: 1 addition & 1 deletion libmysqld/libmysqld.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
{
mysql_read_default_options(&mysql->options,
(mysql->options.my_cnf_file ?
#if defined(STONEDB)
#if defined(TIANMU)
mysql->options.my_cnf_file : MYSQL_CONFIG_NAME),
#else
mysql->options.my_cnf_file : "my"),
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/include/default_mysqld.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@ binlog-direct-non-transactional-updates

loose-show-compatibility-56=ON

stonedb_insert_delayed = 0
stonedb_ini_allowmysqlquerypath=1
tianmu_insert_delayed = 0
tianmu_ini_allowmysqlquerypath=1
File renamed without changes.
File renamed without changes.
8 changes: 0 additions & 8 deletions mysql-test/suite/stonedb/r/issue410.result

This file was deleted.

Loading

0 comments on commit 2f07bb2

Please sign in to comment.