diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-05-18 15:17:26 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-05-18 15:17:26 +0200 |
| commit | 4ea53bc29b1e3069ba72720412016e01b7d7382c (patch) | |
| tree | 7d1a0b239665ef8d5c14c472101c9c5f3388b21b /mysql-test/r/mysqltest.result | |
| parent | 19f0d6b2d9930f83688943b8f98a8b7397584df9 (diff) | |
| parent | e55fb3bbe844dcc5f53ea7bdb6f13b5b79ff56ec (diff) | |
| download | mariadb-git-4ea53bc29b1e3069ba72720412016e01b7d7382c.tar.gz | |
automerge
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 34adadbe6ba..c32553f077e 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -339,11 +339,11 @@ included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: -included from MYSQLTEST_VARDIR/tmp/recursive.sql at line 1: +included from <stdin> at line 1: At line 1: Source directives are nesting too deep garbage ; mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": -included from MYSQLTEST_VARDIR/tmp/error.sql at line 1: +included from <stdin> at line 1: 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 2 = outer loop variable after while @@ -439,7 +439,7 @@ while with string, only once 1 Testing while with not mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest_while.inc": -included from MYSQLTEST_VARDIR/tmp/mysqltest_while.inc at line 65: +included from <stdin> at line 1: At line 64: Nesting too deeply mysqltest: At line 1: missing '(' in while mysqltest: At line 1: missing ')' in while @@ -491,10 +491,10 @@ mysqltest: At line 1: Illegal argument for port: 'illegal_port' mysqltest: At line 1: Illegal option to connect: SMTP 200 connects succeeded mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": -included from MYSQLTEST_VARDIR/tmp/mysqltest.sql at line 3: +included from <stdin> at line 1: At line 3: connection 'test_con1' not found in connection pool mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": -included from MYSQLTEST_VARDIR/tmp/mysqltest.sql at line 2: +included from <stdin> at line 1: At line 2: Connection test_con1 already exists show tables; ERROR 3D000: No database selected |