bk commit into 4.1 tree (iggy:1.2538) BUG#20328

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
4.1 repository of iggy. When iggy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-15 13:40:40-04:00, iggy@stripped +2 -0
  Bug#20328 - Correction to test/rsult for broken Windows build.

  mysql-test/r/mysql_client.result@stripped, 2006-08-15 13:40:38-04:00,
iggy@stripped +0 -44
    Removed OS dependant output.

  mysql-test/t/mysql_client.test@stripped, 2006-08-15 13:40:38-04:00,
iggy@stripped +3 -3
    Re-directed output to a temporary file because the actual output isn't important and
was causing a Windows test failure.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	iggy
# Host:	rolltop.ignatz42.dyndns.org
# Root:	/mnt/storeage/mysql-4.1-maint

--- 1.2/mysql-test/r/mysql_client.result	2006-08-15 13:40:43 -04:00
+++ 1.3/mysql-test/r/mysql_client.result	2006-08-15 13:40:43 -04:00
@@ -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.

--- 1.2/mysql-test/t/mysql_client.test	2006-08-15 13:40:43 -04:00
+++ 1.3/mysql-test/t/mysql_client.test	2006-08-15 13:40:43 -04:00
@@ -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