maria-developers team mailing list archive

Thread
Date

bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2681)

To: maria-developers@xxxxxxxxxxxxxxxxxxx
From: Michael Widenius <monty@xxxxxxxxxxxx>
Date: Thu, 12 Mar 2009 22:29:41 -0000
User-agent: Bazaar (1.12)

#At lp:maria based on revid:monty@xxxxxxxxxxxx-20090312222735-zopxqrhf3xjnfnyd

 2681 Michael Widenius	2009-03-13
      Added missing fix from last commit
      modified:
        mysql-test/r/merge-big.result

=== modified file 'mysql-test/r/merge-big.result'
--- a/mysql-test/r/merge-big.result	2008-02-07 11:04:19 +0000
+++ b/mysql-test/r/merge-big.result	2009-03-12 22:29:39 +0000
@@ -7,7 +7,7 @@ drop table if exists t1,t2,t3,t4,t5,t6;
 CREATE TABLE t1 (c1 INT) ENGINE= MyISAM;
 LOCK TABLE t1 WRITE;
 # connection con1
-SET SESSION debug="+d,sleep_open_and_lock_after_open";
+SET GLOBAL debug="+d,sleep_open_and_lock_after_open";
 INSERT INTO t1 VALUES (1);
 # connection default
 # Let INSERT go into thr_multi_lock().
@@ -21,6 +21,6 @@ SELECT * FROM t1;
 c1
 UNLOCK TABLES;
 # connection con1
-SET SESSION debug="-d,sleep_open_and_lock_after_open";
+SET GLOBAL debug="-d,sleep_open_and_lock_after_open";
 # connection default
 DROP TABLE t1;