Commit d42d3994 authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)
Browse files

Disable code for "let" to assign each column from query to it's own variable

parent a09473e6

client/mysqltest.c

+2 −1
Original line number Diff line number Diff line
@@ -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]);

      }

mysql-test/r/mysqltest.result

+0 −19
Original line number Diff line number Diff line
@@ -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

mysql-test/t/mysqltest.test

+2 −2
Original line number Diff line number Diff line
@@ -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

# ----------------------------------------------------------------------------