diff options
author | Ramil Kalimullin <ramil@mysql.com> | 2010-11-22 12:21:10 +0300 |
---|---|---|
committer | Ramil Kalimullin <ramil@mysql.com> | 2010-11-22 12:21:10 +0300 |
commit | 65116d34089d977929f36542522e79d05786094d (patch) | |
tree | 855936cec6d3b0afd67eb17131c2c9c1133e3d82 /mysql-test/r/mysqltest.result | |
parent | e4d2fd35a7333fb6a9c92c6439b4c4123983ccde (diff) | |
parent | a6294cd5cbd02c48b28fe8b380f8c259f14f9d8c (diff) | |
download | mariadb-git-65116d34089d977929f36542522e79d05786094d.tar.gz |
Manual-merge from mysql-5.1-bugteam.
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r-- | mysql-test/r/mysqltest.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 5acac076292..fe81ef1aaaf 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -308,6 +308,10 @@ var3 two columns with same name var4 from query that returns NULL var5 from query that returns no row failing query in let +create table t1 (a varchar(100)); +insert into t1 values ('`select 42`'); +`select 42` +drop table t1; mysqltest: At line 1: Error running query 'failing query': 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'failing query' at line 1 mysqltest: At line 1: Missing required argument 'filename' to command 'source' mysqltest: At line 1: Could not open './non_existingFile' for reading, errno: 2 @@ -398,7 +402,9 @@ true-inner true-inner again true-outer Counter is greater than 0, (counter=10) +Counter should still be 10, is 10 Counter is not 0, (counter=0) +Not space var works Counter is true, (counter=alpha) Beta is true while with string, only once |