diff options
| author | unknown <lars@mysql.com> | 2006-02-08 10:37:47 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2006-02-08 10:37:47 +0100 |
| commit | 789f7db2f85b092256e223c8272db464fc209b23 (patch) | |
| tree | f4b8dc7552f7a015e045c641bde0d99da60c16df /mysql-test/r/mysqltest.result | |
| parent | 6ca4d3ef766794c175b0aa4a5547439338eb7c38 (diff) | |
| parent | f43fa49b3d2c2bebc61564900c014159cb2f51f1 (diff) | |
| download | mariadb-git-789f7db2f85b092256e223c8272db464fc209b23.tar.gz | |
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
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 f9a195c0649..2ef005f4ceb 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -223,8 +223,8 @@ mysqltest: At line 1: Missing variable name in let mysqltest: At line 1: Missing assignment operator in let mysqltest: At line 1: Missing file name in source mysqltest: At line 1: Could not open file ./non_existingFile -mysqltest: In included file "./var/tmp/recursive.sql": At line 1: Source directives are nesting too deep -mysqltest: In included file "./var/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 +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 2 = outer loop variable after while here is the sourced script @@ -358,9 +358,9 @@ mysqltest: At line 1: Could not open connection 'con2': 1049 Unknown database 'i mysqltest: At line 1: Illegal argument for port: 'illegal_port' mysqltest: At line 1: Illegal option to connect: SMTP OK -mysqltest: In included file "./var/tmp/con.sql": At line 7: Connection limit exhausted - increase MAX_CONS in mysqltest.c -mysqltest: In included file "./var/tmp/con.sql": At line 3: connection 'test_con1' not found in connection pool -mysqltest: In included file "./var/tmp/con.sql": At line 2: Connection test_con1 already exists +mysqltest: In included file "MYSQLTEST_VARDIR/tmp/con.sql": At line 7: Connection limit exhausted - increase MAX_CONS in mysqltest.c +mysqltest: In included file "MYSQLTEST_VARDIR/tmp/con.sql": At line 3: connection 'test_con1' not found in connection pool +mysqltest: In included file "MYSQLTEST_VARDIR/tmp/con.sql": At line 2: Connection test_con1 already exists connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET); Output from mysqltest-x.inc Output from mysqltest-x.inc |