diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-12-19 13:57:38 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-12-19 13:57:38 +0100 |
| commit | 2fba90c1cbdddb5c852a77c2a544e48fe4760796 (patch) | |
| tree | cd94f41640c119ab7a15a570dfb4218f21807bd3 /mysql-test/r/mysqltest.result | |
| parent | 5d618c9e583ea3df82cf76c267865019f0e4aceb (diff) | |
| parent | 2b688f62013ed5c47eb6ea90bd312223b9d7c406 (diff) | |
| download | mariadb-git-2fba90c1cbdddb5c852a77c2a544e48fe4760796.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-rpl
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index a7df1a523cf..48eb0bf5cc0 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -293,7 +293,7 @@ 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: At line 1: Could not open './non_existingFile' for reading mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": At line 1: query 'garbage ' failed: 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 'garbage' at line 1 @@ -443,7 +443,7 @@ ERROR 3D000: No database selected Output from mysqltest-x.inc Output from mysqltest-x.inc Output from mysqltest-x.inc -mysqltest: Could not open ./non_existing_file.inc: errno = 2 +mysqltest: Could not open './non_existing_file.inc' for reading: errno = 2 failing_statement; ERROR 42000: 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_statement' at line 1 failing_statement; |