Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-clean

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;