diff options
author | unknown <monty@narttu.mysql.fi> | 2007-10-01 15:33:21 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2007-10-01 15:33:21 +0300 |
commit | 5b79e3c8d289d4811476cc8aa3c55463eeefabae (patch) | |
tree | dcef169f923497b14f3a476eccea9935fa21fb4f /client/mysqltest.c | |
parent | 9a640f848e465f2bebd27072fa651a230e9632f9 (diff) | |
parent | 0741a4d1b0fa15865fd7bd1a3e8a785d388dd69b (diff) | |
download | mariadb-git-5b79e3c8d289d4811476cc8aa3c55463eeefabae.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
client/mysql_upgrade.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlslap.c:
Auto merged
client/mysqltest.c:
Auto merged
sql/handler.cc:
Auto merged
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r-- | client/mysqltest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 979c8de3656..bcf5515816b 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -4924,7 +4924,7 @@ static struct my_option my_long_options[] = {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.", 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, #endif - {"debug-check", OPT_DEBUG_CHECK, "Check memory and open file usage at exit .", + {"debug-check", OPT_DEBUG_CHECK, "Check memory and open file usage at exit.", (uchar**) &debug_check_flag, (uchar**) &debug_check_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"debug-info", OPT_DEBUG_INFO, "Print some debug info at exit.", |