diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-02-28 10:39:29 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-02-28 10:39:29 +0100 |
| commit | 7c7801f955029de5f1a36cb67df7d72049dd83cc (patch) | |
| tree | e7ffd45086897d64016bb3620f7dd8e9ec53d787 /mysql-test | |
| parent | 51a99d70e92ca9fd1e8e9889a531ab86846d4062 (diff) | |
| parent | df6c28a69a135cad249afe9940cd00a75bccc6b9 (diff) | |
| download | mariadb-git-7c7801f955029de5f1a36cb67df7d72049dd83cc.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-rpl
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
client/mysqltest.c:
Auto merged
mysql-test/t/disabled.def:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 2 |
2 files changed, 2 insertions, 4 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; diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index ac8fc5041de..aba5a53be61 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -12,8 +12,6 @@ user_limits : Bug#23921 random failure of user_limits.test concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences -ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper - federated_transactions : Bug#29523 Transactions do not work lowercase_table3 : Bug#32667 lowercase_table3.test reports to error log kill : Bug#29149: Test "kill" fails on Windows |