summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2005-02-16 10:02:54 +0100
committerunknown <guilhem@mysql.com>2005-02-16 10:02:54 +0100
commit0d4ef3a3e09f8afb2cc9a7385fe555cd1cb4a4c9 (patch)
treea16439c40dd0fb565e2e78b877f93301161e4ebf
parent968e06a8040f87527ca54035b4e07ee69eda6083 (diff)
parent9ffac369d596e5005e5daf534c791cc23a62e308 (diff)
downloadmariadb-git-0d4ef3a3e09f8afb2cc9a7385fe555cd1cb4a4c9.tar.gz
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
-rw-r--r--mysql-test/t/rpl_multi_query.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/rpl_multi_query.test b/mysql-test/t/rpl_multi_query.test
index 15f5d288759..482a2679e7a 100644
--- a/mysql-test/t/rpl_multi_query.test
+++ b/mysql-test/t/rpl_multi_query.test
@@ -3,6 +3,9 @@
# CLIENT_MULTI_STATEMENTS) will be binlogged ONE-query-per-event (not
# one binlog event containing all queries)
+# PS doesn't support multi-statements
+--disable_ps_protocol
+
source include/master-slave.inc;
--disable_warnings
drop database if exists mysqltest;