diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-10-03 19:37:58 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-10-03 19:37:58 +0200 |
| commit | 64e189c37c09a493d391d2a793e69f9a7b50f0d8 (patch) | |
| tree | 63f01aed8b048ca8480b1dbac85e1e908c86fa81 /mysql-test/r | |
| parent | 00677a802beb48e1763eaf8874390bf335ccb43e (diff) | |
| parent | abaa5c91b4307750aeac4582753f2f4131cf4f6f (diff) | |
| download | mariadb-git-64e189c37c09a493d391d2a793e69f9a7b50f0d8.tar.gz | |
merge from 5.1-mtr
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 1044127b06e..8afef65b66f 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -177,6 +177,9 @@ mysqltest: At line 1: End of line junk detected: "disconnect default # comment " mysqltest: At line 1: Extra delimiter ";" found mysqltest: At line 1: Extra delimiter ";" found +mysqltest: At line 1: Spurious text after `query` expression +mysqltest: At line 1: Spurious text after `query` expression +mysqltest: At line 2: Spurious text after `query` expression mysqltest: At line 1: Missing argument(s) to 'error' mysqltest: At line 1: Missing argument(s) to 'error' mysqltest: At line 1: The sqlstate definition must start with an uppercase S @@ -449,12 +452,16 @@ mysqltest: At line 1: Missing required argument 'host' to command 'connect' mysqltest: At line 1: query 'connect con2,localhost,root,,illegal_db' failed: 1049: Unknown database 'illegal_db' mysqltest: At line 1: Illegal argument for port: 'illegal_port' mysqltest: At line 1: Illegal option to connect: SMTP -OK -mysqltest: The test didn't produce any output +200 connects succeeded mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists show tables; ERROR 3D000: No database selected +connect con1,localhost,root,,; +connection default; +connection con1; +disconnect con1; +connection default; Output from mysqltest-x.inc Output from mysqltest-x.inc Output from mysqltest-x.inc |