database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

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

Browse Source 
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"
This commit is contained in:
unknown
2006-01-11 00:24:57 +01:00
parent 935ad7e8f3
commit bbec7eda63
3 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/mysqltest.c
View File

@@ -1205,6 +1205,7 @@ int var_query_set(VAR* var, const char *query, const char** query_end)
{ {
if (row[0]) if (row[0])
{ {
#ifdef NOT_YET
/* Add to <var_name>_<col_name> */ /* Add to <var_name>_<col_name> */
uint j; uint j;
char var_col_name[MAX_VAR_NAME]; 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, var_set(var_col_name, var_col_name + length,
row[i], row[i] + lengths[i]); row[i], row[i] + lengths[i]);
#endif
/* Add column to tab separated string */ /* Add column to tab separated string */
dynstr_append_mem(&result, row[i], lengths[i]); dynstr_append_mem(&result, row[i], lengths[i]);
} }

19
mysql-test/r/mysqltest.result
View File

@@ -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: Missing variable name in let
mysqltest: At line 1: Variable name in =hi does not start with '$' mysqltest: At line 1: Variable name in =hi does not start with '$'
mysqltest: At line 1: Missing assignment operator in let 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: Missing file name in source
mysqltest: At line 1: Could not open file ./non_existingFile 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 mysqltest: In included file "./var/tmp/recursive.sql": At line 1: Source directives are nesting too deep

4
mysql-test/t/mysqltest.test
View File

@@ -543,7 +543,7 @@ echo $novar1;
# Test to assign let from query # Test to assign let from query
# let $<var_name>=`<query>`; # let $<var_name>=`<query>`;
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
--disable_parsing
echo var1; echo var1;
let $var1= `select "hi" as "Col", 1 as "Column1", "hi there" as Col3`; let $var1= `select "hi" as "Col", 1 as "Column1", "hi there" as Col3`;
echo $var1; echo $var1;
@@ -574,7 +574,7 @@ echo $var3_var3;
#echo failing query in let; #echo failing query in let;
#--error 1 #--error 1
#--exec echo "let $var2= `failing query;`" | $MYSQL_TEST 2>&1 #--exec echo "let $var2= `failing query;`" | $MYSQL_TEST 2>&1
--enable_parsing
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Test source command # Test source command
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------