From a86f035a08c4a6e2925ef14e4cce011ec8f8262f Mon Sep 17 00:00:00 2001
From: "iggy@rolltop.ignatz42.dyndns.org" <>
Date: Wed, 16 Aug 2006 13:55:16 -0400
Subject: [PATCH] Bug#20328 - Correction to test/result for broken Windows
 build.

---
 mysql-test/r/mysql_client.result | 44 --------------------------------
 mysql-test/t/mysql_client.test   |  6 ++---
 2 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/mysql-test/r/mysql_client.result b/mysql-test/r/mysql_client.result
index 00d7b6df3cf..87d09428ff6 100644
--- a/mysql-test/r/mysql_client.result
+++ b/mysql-test/r/mysql_client.result
@@ -2,47 +2,3 @@
 1
 ERROR 1064 (42000) at line 3: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 ERROR at line 1: USE must be followed by a database name
-?         (\?) Synonym for `help'.
-clear     (\c) Clear command.
-connect   (\r) Reconnect to the server. Optional arguments are db and host.
-delimiter (\d) Set query delimiter. 
-edit      (\e) Edit command with $EDITOR.
-ego       (\G) Send command to mysql server, display result vertically.
-exit      (\q) Exit mysql. Same as quit.
-go        (\g) Send command to mysql server.
-help      (\h) Display this help.
-nopager   (\n) Disable pager, print to stdout.
-notee     (\t) Don't write into outfile.
-pager     (\P) Set PAGER [to_pager]. Print the query results via PAGER.
-print     (\p) Print current command.
-prompt    (\R) Change your mysql prompt.
-quit      (\q) Quit mysql.
-rehash    (\#) Rebuild completion hash.
-source    (\.) Execute an SQL script file. Takes a file name as an argument.
-status    (\s) Get status information from the server.
-system    (\!) Execute a system shell command.
-tee       (\T) Set outfile [to_outfile]. Append everything into given outfile.
-use       (\u) Use another database. Takes database name as argument.
-charset_name(\C) Switch to another charset. Might be needed for processing binlog.
-?         (\?) Synonym for `help'.
-clear     (\c) Clear command.
-connect   (\r) Reconnect to the server. Optional arguments are db and host.
-delimiter (\d) Set query delimiter. 
-edit      (\e) Edit command with $EDITOR.
-ego       (\G) Send command to mysql server, display result vertically.
-exit      (\q) Exit mysql. Same as quit.
-go        (\g) Send command to mysql server.
-help      (\h) Display this help.
-nopager   (\n) Disable pager, print to stdout.
-notee     (\t) Don't write into outfile.
-pager     (\P) Set PAGER [to_pager]. Print the query results via PAGER.
-print     (\p) Print current command.
-prompt    (\R) Change your mysql prompt.
-quit      (\q) Quit mysql.
-rehash    (\#) Rebuild completion hash.
-source    (\.) Execute an SQL script file. Takes a file name as an argument.
-status    (\s) Get status information from the server.
-system    (\!) Execute a system shell command.
-tee       (\T) Set outfile [to_outfile]. Append everything into given outfile.
-use       (\u) Use another database. Takes database name as argument.
-charset_name(\C) Switch to another charset. Might be needed for processing binlog.
diff --git a/mysql-test/t/mysql_client.test b/mysql-test/t/mysql_client.test
index 9cdf5aea64b..b382357dacf 100644
--- a/mysql-test/t/mysql_client.test
+++ b/mysql-test/t/mysql_client.test
@@ -29,7 +29,7 @@
 --exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1
 
 #
-# Bug #20328: mysql client interprets commands in comments
+# Bug #20328: mysql client: dumb about trailing spaces on 'help' command
 #
---exec echo 'help' | $MYSQL
---exec echo 'help ' | $MYSQL
+--exec echo 'help' | $MYSQL   >  $MYSQLTEST_VARDIR/tmp/bug20328.tmp
+--exec echo 'help ' | $MYSQL  >  $MYSQLTEST_VARDIR/tmp/bug20328.tmp