summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authormonty@mysql.com/narttu.mysql.fi <>2006-12-15 01:01:52 +0200
committermonty@mysql.com/narttu.mysql.fi <>2006-12-15 01:01:52 +0200
commita6481aa4c7016c996a9787db4824307c705ec8a1 (patch)
treeb60f635d3126e8d0f1321f0187390d7cf8496558 /mysql-test/r/mysqltest.result
parent95564bfea31aef4686ae4e7c6d422e2a20a5d73a (diff)
parent88dd873de0d5dc6e8f262268f925596a60b58704 (diff)
downloadmariadb-git-a6481aa4c7016c996a9787db4824307c705ec8a1.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 12a35fcf48b..e8d82ea8515 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -413,6 +413,8 @@ mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 7: Con
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
connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);
+show tables;
+ERROR 3D000: No database selected
Output from mysqltest-x.inc
Output from mysqltest-x.inc
Output from mysqltest-x.inc