diff options
| author | unknown <knielsen@mysql.com> | 2006-01-11 13:03:19 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-01-11 13:03:19 +0100 |
| commit | aa6d8dcc74040b0dec2b923c5b4ccf8d8262d654 (patch) | |
| tree | 7aa0d8e878cdcbfe08029ab20947292f81227d36 /mysql-test | |
| parent | 7ea07618b05ebc4484ba94fdfa29f4f6549e7601 (diff) | |
| parent | cea02f8c0d886ea068f019cf7d3c56d68e7a7c63 (diff) | |
| download | mariadb-git-aa6d8dcc74040b0dec2b923c5b4ccf8d8262d654.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/usr/local/mysql/tmpbuild
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 21 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 4 |
2 files changed, 3 insertions, 22 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 2657fb8a409..067054510c2 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -149,7 +149,7 @@ hello mysqltest: At line 1: End of line junk detected: "6" mysqltest: At line 1: End of line junk detected: "6" mysqltest: At line 1: Missing delimiter -mysqltest: End of line junk detected: "sleep 7 +mysqltest: At line 1: End of line junk detected: "sleep 7 # Another comment " mysqltest: At line 1: Extra delimiter ";" found @@ -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 # ---------------------------------------------------------------------------- |