bk commit into 5.0 tree (msvensson:1.2238) BUG#19890

[msvensson]

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-07-26 14:02:24+02:00, msvensson@neptunus.(none) +3 -0
  Bug#19890 mysqltest: "query" command is broken
   - Allow "query" to be used as a prefix for focing a command to be sent to server
   - Add testcases

  client/mysqltest.c@stripped, 2006-07-26 14:02:21+02:00, msvensson@neptunus.(none) +8 -0
    To force something being sent as a query to the mysqld one can
    use the prefix "query". Remove "query" from string before executing.

  mysql-test/r/mysqltest.result@stripped, 2006-07-26 14:02:21+02:00, msvensson@neptunus.(none) +6 -0
    Add test case for "query" command

  mysql-test/t/mysqltest.test@stripped, 2006-07-26 14:02:21+02:00, msvensson@neptunus.(none) +15 -0
    Add test case for "query" command

# 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:	neptunus.(none)
# Root:	/home/msvensson/mysql/my50-m-bug19890

--- 1.34/mysql-test/r/mysqltest.result	2006-07-26 14:02:28 +02:00
+++ 1.35/mysql-test/r/mysqltest.result	2006-07-26 14:02:28 +02:00
@@ -441,3 +441,9 @@ select-me
 ERROR 42000: 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 'insertz error query' at line 1
 drop table t1;
 drop table t1;
+sleep;
+ERROR 42000: 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 'sleep' at line 1
+sleep;
+ERROR 42000: 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 'sleep' at line 1
+;
+ERROR 42000: Query was empty

--- 1.43/mysql-test/t/mysqltest.test	2006-07-26 14:02:28 +02:00
+++ 1.44/mysql-test/t/mysqltest.test	2006-07-26 14:02:28 +02:00
@@ -1125,3 +1125,18 @@ drop table t1;
 drop table t1;
 
 
+#
+# Bug#19890  	mysqltest: "query" command is broken
+#
+
+# It should be possible to use the command "query" to force mysqltest to
+# send the command to the server although it's a builtin mysqltest command.
+--error 1064
+query sleep;
+
+--error 1064
+--query sleep
+
+# Just an empty query command
+--error 1065
+query ;

--- 1.237/client/mysqltest.c	2006-07-26 14:02:28 +02:00
+++ 1.238/client/mysqltest.c	2006-07-26 14:02:28 +02:00
@@ -4757,6 +4757,14 @@ int main(int argc, char **argv)
 	  q->require_file=require_file;
 	  save_file[0]=0;
 	}
+        /*
+          To force something being sent as a query to the mysqld one can
+          use the prefix "query". Remove "query" from string before executing
+        */
+        if (strncmp(q->query, "query ", 6) == 0)
+        {
+          q->query= q->first_argument;
+        }
 	run_query(&cur_con->mysql, q, flags);
 	query_executed= 1;
         q->last_argument= q->end;