From: Date: December 8 2008 3:44pm
Subject: bzr commit into mysql-6.0-falcon-team branch (hky:2928) Bug#41303
List-Archive: http://lists.mysql.com/commits/60943
X-Bug: 41303
Message-Id: <20081208144413.C7E9512376D@lu0011.efendi.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/hakan/work/mysql/mysql-6.0-falcon-team/ based on revid:olav.sandstaa@stripped

 2928 Hakan Kuecuekyilmaz	2008-12-08
      Fix for Bug#41303 Using global variable makes mysql-test-run test fail
modified:
  mysql-test/suite/falcon/t/falcon_bug_28095.test

per-file messages:
  mysql-test/suite/falcon/t/falcon_bug_28095.test
    Check your environment, when using global variables!
=== modified file 'mysql-test/suite/falcon/t/falcon_bug_28095.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_28095.test	2008-11-13 14:55:42 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_28095.test	2008-12-08 14:43:58 +0000
@@ -37,6 +37,8 @@ CREATE TABLE t2 (b int);
 # following restart really works. Global variables
 # should be resetted after a server restart.
 #
+--let $debug = `SELECT @@GLOBAL.falcon_debug_mask;`
+--replace_result $debug 0 
 SELECT @@GLOBAL.falcon_debug_mask;
 SET GLOBAL falcon_debug_mask = 4096;
 SELECT @@GLOBAL.falcon_debug_mask;
@@ -53,6 +55,7 @@ SELECT * FROM t1 ORDER BY a;
 # --- Check                                         --- #
 # ----------------------------------------------------- #
 SELECT count(*) FROM t1;
+--replace_result $debug 0
 SELECT @@GLOBAL.falcon_debug_mask;
 
 # ----------------------------------------------------- #