From: Nuno Carvalho
Date: May 15 2012 9:27pm
Subject: bzr push into mysql-trunk branch (nuno.carvalho:3844 to 3845) Bug#11754117
List-Archive: http://lists.mysql.com/commits/143803
X-Bug: 11754117
Message-Id: <201205152127.q4FLRRmb000817@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3845 Nuno Carvalho	2012-05-15 [merge]
      BUG#11754117 - 45670: INTVAR_EVENTS FOR FILTERED-OUT QUERY_LOG_EVENTS ARE EXECUTED
      
      Automerge from mysql-5.5 into mysql-trunk.

    modified:
      mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
      mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
 3844 Marc Alff	2012-05-15
      Fixed the order of parameters when calling _aligned_malloc (Windows specific)

    modified:
      storage/perfschema/pfs_global.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result'
--- a/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result	2012-04-30 16:14:26 +0000
+++ b/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result	2012-05-15 21:24:58 +0000
@@ -118,18 +118,18 @@ id	c
 3	3
 [on master]
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-CREATE TABLE test.t5 (a INT AUTO_INCREMENT PRIMARY KEY, b INT, c INT);
+CREATE TABLE test.t5 (a INT AUTO_INCREMENT PRIMARY KEY, b DECIMAL(20,20), c INT);
 CREATE TABLE test.t1 (a INT);
 INSERT INTO test.t1 VALUES(1);
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
-CREATE TABLE test.t_slave (a INT AUTO_INCREMENT PRIMARY KEY, b INT, c INT);
+CREATE TABLE test.t_slave (a INT AUTO_INCREMENT PRIMARY KEY, b DECIMAL(20,20), c INT);
 CREATE TRIGGER t1_update AFTER UPDATE ON test.t1 FOR EACH ROW
-INSERT INTO test.t_slave VALUES(NULL, ROUND(RAND() * 1000), @c);
+INSERT INTO test.t_slave VALUES(NULL, RAND(), @c);
 SET INSERT_ID=2;
 SET @c=2;
 SET @@rand_seed1=10000000, @@rand_seed2=1000000;
-INSERT INTO t5 VALUES (NULL, ROUND(RAND() * 1000), @c);
+INSERT INTO t5 VALUES (NULL, RAND(), @c);
 Warnings:
 Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
 SELECT b into @b FROM test.t5;
@@ -137,6 +137,7 @@ UPDATE test.t1 SET a=2;
 SELECT a AS 'ONE' into @a FROM test.t_slave;
 SELECT c AS 'NULL' into @c FROM test.t_slave;
 SELECT b into @b FROM test.t_slave;
+include/assert.inc [Random values from master and slave must be different]
 drop table test.t5;
 drop table test.t1;
 drop table test.t_slave;

=== modified file 'mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test'
--- a/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test	2012-04-30 16:14:26 +0000
+++ b/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test	2012-05-15 21:24:58 +0000
@@ -216,22 +216,24 @@ drop table if exists t1,t2,t3,t4,t5,t6,t
 # be filtered as well.
 #
 connection master;
-CREATE TABLE test.t5 (a INT AUTO_INCREMENT PRIMARY KEY, b INT, c INT); # ignored on slave
+# Although RAND() is from 0 to 1.0, DECIMAL(M,D), requires that M must be >= D.
+CREATE TABLE test.t5 (a INT AUTO_INCREMENT PRIMARY KEY, b DECIMAL(20,20), c INT); # ignored on slave
 CREATE TABLE test.t1 (a INT); # accepted on slave
 INSERT INTO test.t1 VALUES(1);
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 
 --sync_slave_with_master
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
-CREATE TABLE test.t_slave (a INT AUTO_INCREMENT PRIMARY KEY, b INT, c INT);
+# Although RAND() is from 0 to 1.0, DECIMAL(M,D), requires that M must be >= D.
+CREATE TABLE test.t_slave (a INT AUTO_INCREMENT PRIMARY KEY, b DECIMAL(20,20), c INT);
 CREATE TRIGGER t1_update AFTER UPDATE ON test.t1 FOR EACH ROW
-                               INSERT INTO test.t_slave VALUES(NULL, ROUND(RAND() * 1000), @c);
+                               INSERT INTO test.t_slave VALUES(NULL, RAND(), @c);
 
 connection master;
 SET INSERT_ID=2;
 SET @c=2;
 SET @@rand_seed1=10000000, @@rand_seed2=1000000;
-INSERT INTO t5 VALUES (NULL, ROUND(RAND() * 1000), @c); # to be ignored
+INSERT INTO t5 VALUES (NULL, RAND(), @c); # to be ignored
 SELECT b into @b FROM test.t5;
 --let $b_master=`select @b`
 UPDATE test.t1 SET a=2; # to run trigger on slave
@@ -255,10 +257,9 @@ if (`SELECT @a != 2 and @c != NULL`)
 SELECT b into @b FROM test.t_slave;
 --let $b_slave=`select @b`
 
-if (`SELECT $b_slave = $b_master`)
-{
-    --echo Might be pure coincidence of two randoms from master and slave table. Don not panic yet.
-}
+--let $assert_text= Random values from master and slave must be different
+--let $assert_cond= $b_master != $b_slave
+--source include/assert.inc
 
 # cleanup BUG#11754117
 connection master;

No bundle (reason: useless for push emails).