summaryrefslogtreecommitdiff
path: root/mysql-test/t/init_connect.test
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-12-21 19:39:32 +0200
committerunknown <monty@mysql.com>2003-12-21 19:39:32 +0200
commitd31c6628e1494dd561f96cfb8a1fbfde17fc8ed4 (patch)
tree82780d2f52e09f3ef112e35fc6f6b3e1dadc3a56 /mysql-test/t/init_connect.test
parent9e56a0a7711e1f6f2b234db54b3e3d2004069bbf (diff)
downloadmariadb-git-d31c6628e1494dd561f96cfb8a1fbfde17fc8ed4.tar.gz
Portability fixes found during 5.0 test compilation
Fixed bug in ORDER BY on a small column (Bug #2147) Fixed error from pthread_mutex_destroy() when one had wrong errmsg file client/mysqltest.c: Added handling of error on query send (Needed for init_connection.test) mysql-test/mysql-test-run.sh: Added tracing of mysqldump and mysqlbinlog mysql-test/r/init_connect.result: Updated tests mysql-test/r/order_by.result: Added test for bug filesort bug mysql-test/t/init_connect-master.opt: Added proper quoting (for Solaris and OSF) mysql-test/t/init_connect.test: Portability fix mysql-test/t/order_by.test: Added test for bug #2147 (bug in filesort) sql/filesort.cc: Fixed bug in filesort (Bug #2147) sql/item.h: Clear 'fixed' on cleanup (For prepared statements) sql/item_func.cc: Protect mutex destroy. (Fixed error from pthread_mutex_destroy() when one had wrong errmsg file) sql/log_event.cc: Portability fix sql/sql_class.h: Fixed compiler warning sql/sql_prepare.cc: Portability fix. (Some compilers doesn't support jump over variables declared in for())
Diffstat (limited to 'mysql-test/t/init_connect.test')
-rw-r--r--mysql-test/t/init_connect.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/init_connect.test b/mysql-test/t/init_connect.test
index 563ec6178d0..29962abc04d 100644
--- a/mysql-test/t/init_connect.test
+++ b/mysql-test/t/init_connect.test
@@ -28,7 +28,7 @@ connection con0;
set GLOBAL init_connect="adsfsdfsdfs";
connect (con5,localhost,user_1,,);
connection con5;
---error 2013
+--error 2013,2006
select @a;
connection con0;
drop table t1;