Merge bk-internal.mysql.com:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

2 files changed, 3 insertions, 1 deletions

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 489063ffc73..b4fa293c19c 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -158,7 +158,7 @@ static struct my_option my_long_options[] =
    (gptr*) &opt_compatible_mode_str, (gptr*) &opt_compatible_mode_str, 0,
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"compact", OPT_COMPACT,
-   "Give less verbose output (useful for debugging). Disables structure comments and header/footer constructs.  Enables options --skip-add-drop-table --no-set-names --skip-disable-keys --skip-lock-tables",
+   "Give less verbose output (useful for debugging). Disables structure comments and header/footer constructs.  Enables options --skip-add-drop-table --no-set-names --skip-disable-keys --skip-add-locks",
    (gptr*) &opt_compact, (gptr*) &opt_compact, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
    0, 0},
   {"complete-insert", 'c', "Use complete insert statements.", (gptr*) &cFlag,
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test
index baa37dbf41d..08c1ad85fb1 100644
--- a/mysql-test/t/ps_1general.test
+++ b/mysql-test/t/ps_1general.test
@@ -294,12 +294,14 @@ execute stmt4;
 prepare stmt4 from ' show table status from test like ''t2%'' ';
 # egalize date and time values
 --replace_column 12 # 13 # 14 #
+--replace_result 2147483647 64424509439
 # Bug#4288 : prepared statement 'show table status ..', wrong output on execute
 execute stmt4;
 # try the same with the big table
 prepare stmt4 from ' show table status from test like ''t9%'' ';
 # egalize date and time values
 --replace_column 12 # 13 # 14 #
+--replace_result 2147483647 4294967295
 # Bug#4288
 execute stmt4;
 prepare stmt4 from ' show status like ''Threads_running'' ';