diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-09-28 16:00:11 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-09-28 16:00:11 +0200 |
| commit | bd71a486494329f79d00bf3c0535e4a1032ba958 (patch) | |
| tree | bcd98a4fa5fdf5dfaa79928b31900a19b96f4e49 /mysql-test/r/mysqltest.result | |
| parent | 500cb492959eef3771f03fd516eb1a21fb2924da (diff) | |
| parent | 9605bc63fc7fe2d2b188d992ae43d9e97360c782 (diff) | |
| download | mariadb-git-bd71a486494329f79d00bf3c0535e4a1032ba958.tar.gz | |
upmerge 56125,56921
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index d7597599f02..cff845a2819 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -453,12 +453,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 |