From bbec7eda631db68ef9b124c869193b2eceac24ec Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Wed, 11 Jan 2006 00:24:57 +0100
Subject: [PATCH] Disable code for "let" to assign each column from query to
 it's own variable

client/mysqltest.c:
  Disable "let" assign each column of query to own var
mysql-test/r/mysqltest.result:
  Remove test results for disabled test
mysql-test/t/mysqltest.test:
  Disable test for "let assigns each column of query to own var"
---
 client/mysqltest.c            |  3 ++-
 mysql-test/r/mysqltest.result | 19 -------------------
 mysql-test/t/mysqltest.test   |  4 ++--
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index c31e8bc693b..a073df979f2 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1205,6 +1205,7 @@ int var_query_set(VAR* var, const char *query, const char** query_end)
     {
       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 @@ int var_query_set(VAR* var, const char *query, const char** query_end)
         }
 	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]);
       }
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 2657fb8a409..d0db0269a98 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -222,25 +222,6 @@ mysqltest: At line 1: Missing arguments to let
 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
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index ae28a66c685..ee309fbd7c9 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -543,7 +543,7 @@ echo $novar1;
 # 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 $var3_var3;
 #echo failing query in let;
 #--error 1
 #--exec echo "let $var2= `failing query;`" | $MYSQL_TEST 2>&1
-
+--enable_parsing
 # ----------------------------------------------------------------------------
 # Test source command
 # ----------------------------------------------------------------------------