From: Date: August 16 2006 5:03pm
Subject: bk commit into 5.0 tree (msvensson:1.2255) BUG#20328
List-Archive: http://lists.mysql.com/commits/10552
X-Bug: 20328
Message-Id: <20060816150346.983CF860061@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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-16 17:03:41+02:00, msvensson@shellback.(none) +4 -0
  Bug#20328 mysql client: dumb about trailing spaces on 'help' command
   Fix testcase to also work on windows

  BitKeeper/deleted/.del-mysql_client.result@stripped, 2006-08-16 17:01:23+02:00, msvensson@shellback.(none) +0 -0
    Delete: mysql-test/r/mysql_client.result

  BitKeeper/deleted/.del-mysql_client.test@stripped, 2006-08-16 17:01:16+02:00, msvensson@shellback.(none) +0 -0
    Delete: mysql-test/t/mysql_client.test

  mysql-test/r/mysql.result@stripped, 2006-08-16 17:03:38+02:00, msvensson@shellback.(none) +8 -0
    Update test result

  mysql-test/t/mysql.test@stripped, 2006-08-16 17:03:38+02:00, msvensson@shellback.(none) +45 -1
    Move tests from mysql_client to mysql
    Fix test case for bug#20328 to work on windows by comparing the output from "help" and "help " 

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/bug20328/my50-bug20328

--- 1.13/mysql-test/r/mysql.result	2006-08-16 17:03:46 +02:00
+++ 1.14/mysql-test/r/mysql.result	2006-08-16 17:03:46 +02:00
@@ -114,4 +114,12 @@
 b	varchar(255)	YES		NULL	
 c	int(11)	YES		NULL	
 drop table t1;
+1
+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
+\
+\\
+';
+';
 End of 5.0 tests

--- 1.13/mysql-test/t/mysql.test	2006-08-16 17:03:46 +02:00
+++ 1.14/mysql-test/t/mysql.test	2006-08-16 17:03:46 +02:00
@@ -94,6 +94,50 @@
 --exec $MYSQL test -e "connect verylongdatabasenamethatshouldblowthe256byteslongbufferincom_connectfunctionxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxkxendcccccccdxxxxxxxxxxxxxxxxxkskskskskkskskskskskskskskskskkskskskskkskskskskskskskskskend" 2>&1
 --enable_parsing
 
---echo End of 5.0 tests
 
+#
+# Bug #20432: mysql client interprets commands in comments
+#
+
+# if the client sees the 'use' within the comment, we haven't fixed
+--exec echo "/*"          >  $MYSQLTEST_VARDIR/tmp/bug20432.sql
+--exec echo "use"         >> $MYSQLTEST_VARDIR/tmp/bug20432.sql
+--exec echo "*/"          >> $MYSQLTEST_VARDIR/tmp/bug20432.sql
+--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1
+
+# SQL can have embedded comments => workie
+--exec echo "select /*"   >  $MYSQLTEST_VARDIR/tmp/bug20432.sql
+--exec echo "use"         >> $MYSQLTEST_VARDIR/tmp/bug20432.sql
+--exec echo "*/ 1"        >> $MYSQLTEST_VARDIR/tmp/bug20432.sql
+--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1
+
+# client commands on the other hand must be at BOL => error
+--exec echo "/*"          >  $MYSQLTEST_VARDIR/tmp/bug20432.sql
+--exec echo "xxx"         >> $MYSQLTEST_VARDIR/tmp/bug20432.sql
+--exec echo "*/ use"      >> $MYSQLTEST_VARDIR/tmp/bug20432.sql
+--error 1
+--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1
+
+# client comment recognized, but parameter missing => error
+--exec echo "use"         >  $MYSQLTEST_VARDIR/tmp/bug20432.sql
+--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1
 
+#
+# Bug #20328: mysql client interprets commands in comments
+#
+--exec $MYSQL -e 'help' > $MYSQLTEST_VARDIR/tmp/bug20328_1.result
+--exec $MYSQL -e 'help ' > $MYSQLTEST_VARDIR/tmp/bug20328_2.result
+--exec diff $MYSQLTEST_VARDIR/tmp/bug20328_1.result $MYSQLTEST_VARDIR/tmp/bug20328_2.result
+
+#
+# Bug #20103: Escaping with backslash does not work
+#
+--exec echo "SET SQL_MODE = 'NO_BACKSLASH_ESCAPES';"  > $MYSQLTEST_VARDIR/tmp/bug20103.sql
+--exec echo "SELECT '\';" >> $MYSQLTEST_VARDIR/tmp/bug20103.sql
+--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20103.sql 2>&1
+
+--exec echo "SET SQL_MODE = '';"  > $MYSQLTEST_VARDIR/tmp/bug20103.sql
+--exec echo "SELECT '\';';" >> $MYSQLTEST_VARDIR/tmp/bug20103.sql
+--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20103.sql 2>&1
+
+--echo End of 5.0 tests