diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-07 11:58:00 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-07 11:58:00 +0200 |
| commit | 26e4ea620bb01bfa27cdcb873274d3372b20f5db (patch) | |
| tree | 32865e1900bcc216cde21fb95233038d0d20f26d /mysql-test/r/mysqltest.result | |
| parent | 04e8c93c20a5517cfd57ef71ea91a3cea531828b (diff) | |
| parent | c35318cee16459c96be5803e80e2a2d9857615b3 (diff) | |
| download | mariadb-git-26e4ea620bb01bfa27cdcb873274d3372b20f5db.tar.gz | |
Merge 192.168.0.7:mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 7c63bb78967..97747987110 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -280,6 +280,18 @@ let $B = changed value of B; var2: content of variable 1 var3: content of variable 1 content of variable 1 length of var3 is longer than 0 +var1 +hi 1 hi there +var2 +2 +var2 again +2 +var3 two columns with same name +1 2 3 +var4 from query that returns NULL +var5 from query that returns no row +failing query in let +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 file ./non_existingFile mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep |