After merge fixes

mysql-test/r/select.result

@@ -2628,6 +2628,13 @@ select f1 from t1,t2 where f1=f2 and (f1,NULL) = ((1,1));
 f1
 select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,NULL));
 f1
+insert into t1 values(1,1),(2,null);
+insert into t2 values(2);
+select * from t1,t2 where f1=f3 and (f1,f2) = (2,null);
+f1	f2	f3
+select * from t1,t2 where f1=f3 and (f1,f2) <=> (2,null);
+f1	f2	f3
+2	NULL	2
 drop table t1,t2;
 CREATE TABLE t1 ( city char(30) );
 INSERT INTO t1 VALUES ('London');

mysql-test/r/subselect2.result

@@ -15,6 +15,8 @@ DOCID VARCHAR(32)BINARY NOT NULL
 ) ENGINE=InnoDB
 ;
 INSERT INTO t1 (DOCID) VALUES ("1"), ("2");
+Warnings:
+Warning	1364	Field 'UUID' doesn't have a default value
 CREATE TABLE t2
 (
 DOCID VARCHAR(32)BINARY NOT NULL

sql/sql_parse.cc

@@ -3209,7 +3209,7 @@ end_with_restore_list:
 	break;
 
       /* Check slave filtering rules */
-      if (thd->slave_thread && all_tables_not_ok(thd,tables))
+      if (thd->slave_thread && all_tables_not_ok(thd, all_tables))
       {
 	/* we warn the slave SQL thread */
 	my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));