diff options
| author | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-09-15 14:15:09 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-09-15 14:15:09 +0500 |
| commit | 7d131bcde2b28d49889c83d870feafe8dd18f8d9 (patch) | |
| tree | 00006c6cbee669c563a259186f3122074e24f963 /client | |
| parent | 549c922bdb151d767b29186c404f5a8a540152a0 (diff) | |
| parent | bba4e89a514b7d61ef04ce012514538ee59dff35 (diff) | |
| download | mariadb-git-7d131bcde2b28d49889c83d870feafe8dd18f8d9.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/usr/home/ram/work/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 06f6ab2f1ce..edcce59e136 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -155,6 +155,7 @@ static my_bool ps_protocol= 0, ps_protocol_enabled= 0; static my_bool sp_protocol= 0, sp_protocol_enabled= 0; static my_bool view_protocol= 0, view_protocol_enabled= 0; static my_bool cursor_protocol= 0, cursor_protocol_enabled= 0; +static my_bool opt_valgrind_test= 0; static int parsing_disabled= 0; static char **default_argv; @@ -3286,6 +3287,8 @@ static struct my_option my_long_options[] = 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"user", 'u', "User for login.", (gptr*) &user, (gptr*) &user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"valgrind", 'N', "Define VALGRIND_TEST to 1.", (gptr*) &opt_valgrind_test, + (gptr*) &opt_valgrind_test, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"verbose", 'v', "Write more.", (gptr*) &verbose, (gptr*) &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"version", 'V', "Output version information and exit.", @@ -5060,6 +5063,9 @@ static void init_var_hash(MYSQL *mysql) die("Variable hash initialization failed"); my_hash_insert(&var_hash, (byte*) var_init(0,"BIG_TEST", 0, (opt_big_test) ? "1" : "0", 0)); + my_hash_insert(&var_hash, (byte*) var_init(0,"VALGRIND_TEST", 0, + (opt_valgrind_test) ? "1" : "0", + 0)); v= var_init(0,"MAX_TABLES", 0, (sizeof(ulong) == 4) ? "31" : "62",0); my_hash_insert(&var_hash, (byte*) v); v= var_init(0,"SERVER_VERSION", 0, mysql_get_server_info(mysql), 0); |