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

into  mysql.com:/opt/local/work/mysql-4.1-root

1 files changed, 17 insertions, 1 deletions

diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index beae95d462a..a4911115c9f 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -702,4 +702,20 @@ select ??;
 select ? from t1;
 --enable_ps_protocol
 drop table t1;
-# 
+#
+# Bug#9359 "Prepared statements take snapshot of system vars at PREPARE
+# time"
+#
+prepare stmt from "select @@time_zone";
+execute stmt;
+set @@time_zone:='Japan';
+execute stmt;
+prepare stmt from "select @@tx_isolation";
+execute stmt;
+set transaction isolation level read committed;
+execute stmt;
+set transaction isolation level serializable;
+execute stmt;
+set @@tx_isolation=default;
+execute stmt;
+deallocate prepare stmt;