bk commit into 5.0 tree (msvensson:1.2029)

[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
  1.2029 06/01/11 00:24:57 msvensson@neptunus.(none) +3 -0
  Disable code for "let" to assign each column from query to it's own variable

  mysql-test/t/mysqltest.test
    1.27 06/01/11 00:24:51 msvensson@neptunus.(none) +2 -2
    Disable test for "let assigns each column of query to own var" 

  mysql-test/r/mysqltest.result
    1.23 06/01/11 00:24:51 msvensson@neptunus.(none) +0 -19
    Remove test results for disabled test

  client/mysqltest.c
    1.193 06/01/11 00:24:51 msvensson@neptunus.(none) +2 -1
    Disable "let" assign each column of query to own var

# 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/wl2930_fixup/my50-wl2930_fixup

--- 1.22/mysql-test/r/mysqltest.result	2005-12-29 09:48:36 +01:00
+++ 1.23/mysql-test/r/mysqltest.result	2006-01-11 00:24:51 +01:00
@@ -222,25 +222,6 @@
 mysqltest: At line 1: Missing variable name in let
 mysqltest: At line 1: Variable name in =hi does not start with '$'
 mysqltest: At line 1: Missing assignment operator in let
-var1
-hi	1	hi there
-hi
-1
-hi there
-var2
-2
-
-
-var2 again
-2
-
-2
-
-var3 two columns with same name
-1	2	3
-2
-2
-3
 mysqltest: At line 1: Missing file name in source
 mysqltest: At line 1: Could not open file ./non_existingFile
 mysqltest: In included file "./var/tmp/recursive.sql": At line 1: Source directives are nesting too deep

--- 1.26/mysql-test/t/mysqltest.test	2006-01-09 20:12:14 +01:00
+++ 1.27/mysql-test/t/mysqltest.test	2006-01-11 00:24:51 +01:00
@@ -543,7 +543,7 @@
 # Test to assign let from query
 # let $<var_name>=`<query>`;
 # ----------------------------------------------------------------------------
-
+--disable_parsing
 echo var1;
 let $var1= `select "hi" as "Col", 1 as "Column1", "hi there" as Col3`;
 echo $var1;
@@ -574,7 +574,7 @@
 #echo failing query in let;
 #--error 1
 #--exec echo "let $var2= `failing query;`" | $MYSQL_TEST 2>&1
-
+--enable_parsing
 # ----------------------------------------------------------------------------
 # Test source command
 # ----------------------------------------------------------------------------

--- 1.192/client/mysqltest.c	2006-01-10 15:56:24 +01:00
+++ 1.193/client/mysqltest.c	2006-01-11 00:24:51 +01:00
@@ -1205,6 +1205,7 @@
     {
       if (row[0])
       {
+#ifdef NOT_YET
 	/* Add to <var_name>_<col_name> */
 	uint j;
 	char var_col_name[MAX_VAR_NAME];
@@ -1218,7 +1219,7 @@
         }
 	var_set(var_col_name,  var_col_name + length,
 		row[i], row[i] + lengths[i]);
-
+#endif
         /* Add column to tab separated string */
 	dynstr_append_mem(&result, row[i], lengths[i]);
       }