diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-06-24 22:11:00 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-06-24 22:11:00 +0300 |
| commit | a96e1b6954f56504b831c61bae50899b79575827 (patch) | |
| tree | 2c5662a19583d6ae066e383d5de337ae60cf618f /client | |
| parent | 8f33f8d4d36080b161fac72971239afd4bf3137f (diff) | |
| download | mariadb-git-a96e1b6954f56504b831c61bae50899b79575827.tar.gz | |
Fixed bug in multi-table-delete code
client/mysqltest.c:
Added --big-test argument
libmysqld/lib_sql.cc:
Reset error messages before new query.
libmysqld/lib_vio.c:
Fixed reading of results.
mysql-test/mysql-test-run.sh:
Added option --big
mysql-test/r/multi_update.result:
More multi-delete tests
mysql-test/t/bdb-crash.test:
Added missing test if BDB is supported
mysql-test/t/multi_update.test:
More multi-delete tests
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 4ce5f23b28b..495051569b7 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -43,7 +43,7 @@ **********************************************************************/ -#define MTEST_VERSION "1.9" +#define MTEST_VERSION "1.10" #include <global.h> #include <my_sys.h> @@ -84,7 +84,7 @@ static int record = 0, verbose = 0, silent = 0, opt_sleep=0; static char *db = 0, *pass=0; const char* user = 0, *host = 0, *unix_sock = 0; -static int port = 0; +static int port = 0, opt_big_test=0; static uint start_lineno, *lineno; static char **default_argv; @@ -1410,6 +1410,7 @@ struct option long_options[] = { {"debug", optional_argument, 0, '#'}, {"database", required_argument, 0, 'D'}, + {"big-test", no_argument, 0, 'B'}, {"help", no_argument, 0, '?'}, {"host", required_argument, 0, 'h'}, {"password", optional_argument, 0, 'p'}, @@ -1453,6 +1454,7 @@ void usage() -u, --user=... User for login.\n\ -p[password], --password[=...]\n\ Password to use when connecting to server.\n\ + -B, --big-test Define BIG_TEST to 1\n\ -D, --database=... Database to use.\n\ -P, --port=... Port number to use for connection.\n\ -S, --socket=... Socket file to use for connection.\n\ @@ -1475,7 +1477,7 @@ int parse_args(int argc, char **argv) load_defaults("my",load_default_groups,&argc,&argv); default_argv= argv; - while((c = getopt_long(argc, argv, "h:p::u:P:D:S:R:x:t:T:#:?rvVq", + while((c = getopt_long(argc, argv, "h:p::u:BP:D:S:R:x:t:T:#:?rvVq", long_options, &option_index)) != EOF) { switch(c) { @@ -1508,6 +1510,9 @@ int parse_args(int argc, char **argv) else tty_password=1; break; + case 'B': + opt_big_test=1; + break; case 'P': port = atoi(optarg); break; @@ -1814,6 +1819,7 @@ static void var_from_env(const char* name, const char* def_val) hash_insert(&var_hash, (byte*)v); } + static void init_var_hash() { if (hash_init(&var_hash, 1024, 0, 0, get_var_key, var_free, MYF(0))) @@ -1821,6 +1827,7 @@ static void init_var_hash() var_from_env("MASTER_MYPORT", "9306"); var_from_env("SLAVE_MYPORT", "9307"); var_from_env("MYSQL_TEST_DIR", "/tmp"); + var_from_env("BIG_TEST", opt_big_test ? "1" : "0"); } int main(int argc, char** argv) |