Merge lp:~dshrews/drizzle/bug701056 into lp:drizzle/7.0

[David Shrewsbury]

Fixes filtered_replicator to recognize schema on CREATE TABLE queries. Also fixes a bug where a mutex was not released properly. Adds new test cases for filtered_replicator and removes one that actually tested nothing.

=== modified file 'plugin/filtered_replicator/filtered_replicator.cc'
--- plugin/filtered_replicator/filtered_replicator.cc	2010-12-30 18:07:58 +0000
+++ plugin/filtered_replicator/filtered_replicator.cc	2011-01-10 18:00:22 +0000
@@ -192,13 +192,13 @@
     }
     case message::Statement::CREATE_TABLE:
     {
-      // in_schema_name.assign(in_statement.create_table_statement().table().name());
+      in_schema_name.assign(in_statement.create_table_statement().table().schema());
       in_table_name.assign(in_statement.create_table_statement().table().name());
       break;
     }
     case message::Statement::ALTER_TABLE:
     {
-      // in_schema_name.assign(in_statement.alter_table_statement().table().name());
+      in_schema_name.assign(in_statement.alter_table_statement().after().schema());
       in_table_name.assign(in_statement.alter_table_statement().after().name());
       break;
     }
@@ -498,6 +498,7 @@
   _sch_filter.assign(input);
   schemas_to_filter.clear();
   populateFilter(_sch_filter, schemas_to_filter);
+  pthread_mutex_unlock(&sysvar_sch_lock);
   pthread_mutex_unlock(&sch_vector_lock);
 }
 
@@ -574,16 +575,16 @@
 {
   context("filteredschemas",
           po::value<string>(&sysvar_filtered_replicator_sch_filters)->default_value(""),
-          N_("List of schemas to filter"));
+          N_("Comma-separated list of schemas to exclude"));
   context("filteredtables",
           po::value<string>(&sysvar_filtered_replicator_tab_filters)->default_value(""),
-          N_("List of tables to filter"));
+          N_("Comma-separated list of tables to exclude"));
   context("schemaregex", 
           po::value<string>()->default_value(""),
-          N_("Regular expression to apply to schemas to filter"));
+          N_("Regular expression to apply to schemas to exclude"));
   context("tableregex", 
           po::value<string>()->default_value(""),
-          N_("Regular expression to apply to tables to filter"));
+          N_("Regular expression to apply to tables to exclude"));
 }
 
 } /* namespace drizzle_plugin */

=== removed file 'plugin/filtered_replicator/tests/r/filtered_replicator.result'
--- plugin/filtered_replicator/tests/r/filtered_replicator.result	2010-12-21 20:47:29 +0000
+++ plugin/filtered_replicator/tests/r/filtered_replicator.result	1970-01-01 00:00:00 +0000
@@ -1,322 +0,0 @@
-set global filtered_replicator_filteredtables=t2;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (
-id INT NOT NULL PRIMARY KEY
-, padding VARCHAR(200) NOT NULL
-);
-INSERT INTO t1 VALUES (1, "I love testing.");
-INSERT INTO t1 VALUES (2, "I hate testing.");
-DROP TABLE t1;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (
-id INT NOT NULL PRIMARY KEY
-, padding VARCHAR(200) NOT NULL
-);
-INSERT INTO t1 VALUES (1, "I love testing."), (2, "I hate testing.");
-DROP TABLE t1;
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-CREATE TABLE t1 (
-id INT NOT NULL PRIMARY KEY
-, padding VARCHAR(200) NOT NULL
-);
-INSERT INTO t1 VALUES (1, "I love testing.");
-INSERT INTO t1 VALUES (2, "I hate testing.");
-CREATE TABLE t2 (
-id INT NOT NULL PRIMARY KEY
-, padding VARCHAR(200) NOT NULL
-);
-INSERT INTO t2 SELECT * FROM t1;
-DROP TABLE t1, t2;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (
-id INT NOT NULL
-, padding VARCHAR(200) NOT NULL
-, PRIMARY KEY (id)
-);
-INSERT INTO t1 VALUES (1, "I love testing.");
-INSERT INTO t1 VALUES (2, "I hate testing.");
-ALTER TABLE t1 ADD dummy INT;
-ALTER TABLE t1 ADD INDEX ix_padding (padding(20));
-DROP TABLE t1;
-DROP SCHEMA IF EXISTS my_new_schema;
-CREATE SCHEMA my_new_warnings;
-DROP SCHEMA my_new_warnings;
-DROP TABLE IF EXISTS t1, t2;
-CREATE TABLE t1 (
-id INT NOT NULL
-, padding VARCHAR(200) NOT NULL
-, PRIMARY KEY (id)
-);
-RENAME TABLE t1 TO t2;
-DROP TABLE t2;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (
-id INT NOT NULL
-, padding VARCHAR(200) NOT NULL
-, PRIMARY KEY (id)
-);
-INSERT INTO t1 VALUES (1, "I love testing.");
-INSERT INTO t1 VALUES (2, "I hate testing.");
-DELETE FROM t1 where id = 1;
-DROP TABLE t1;
-CREATE TABLE t1 (
-id INT NOT NULL
-, other INT NOT NULL
-, PRIMARY KEY (id)
-);
-INSERT INTO t1 VALUES (1, 1);
-INSERT INTO t1 VALUES (2, 2);
-INSERT INTO t1 VALUES (3, 3);
-INSERT INTO t1 VALUES (4, 4);
-INSERT INTO t1 VALUES (5, 5);
-INSERT INTO t1 VALUES (6, 6);
-INSERT INTO t1 VALUES (7, 7);
-INSERT INTO t1 VALUES (8, 8);
-DELETE FROM t1;
-DROP TABLE t1;
-Start Test of LP Bug #496101
-CREATE TABLE t1 (
-id INT NOT NULL
-, padding VARCHAR(200) NOT NULL
-, PRIMARY KEY (id)
-);
-START TRANSACTION;
-INSERT INTO t1 VALUES (1, "I love testing.");
-INSERT INTO t1 VALUES (2, "I hate testing.");
-DELETE FROM t1 where id = 1;
-COMMIT;
-DROP TABLE t1;
-End Test of LP Bug #496101
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (
-id INT NOT NULL
-, padding VARCHAR(200) NOT NULL
-, PRIMARY KEY (id)
-);
-INSERT INTO t1 VALUES (1, "I love testing.");
-INSERT INTO t1 VALUES (2, "I hate testing.");
-UPDATE t1 SET padding= "XXX" WHERE id= 1;
-UPDATE t1 SET padding= "AAA";
-DROP TABLE t1;
-CREATE TABLE t1 (
-id int AUTO_INCREMENT NOT NULL PRIMARY KEY
-, name varchar(1024)
-, alias varchar(1024)
-);
-INSERT INTO t1 (name,alias) VALUES ("jeff lebowski","dude");
-UPDATE t1 SET alias = "the dude" WHERE alias = "dude";
-DROP TABLE t1;
-CREATE TABLE t1 (
-id INT NOT NULL
-, counter INT NOT NULL
-, PRIMARY KEY (id)
-);
-INSERT INTO t1 (id, counter) VALUES (1,1),(2,2),(3,3);
-UPDATE t1 SET counter = counter + 1 WHERE id = 1;
-UPDATE t1 SET counter = counter + 1 WHERE id IN (2,3);
-DROP TABLE t1;
-CREATE TABLE t1 (
-id INT NOT NULL
-, padding VARCHAR(200) NOT NULL
-, PRIMARY KEY (id)
-);
-INSERT INTO t1 VALUES (1, "I love testing.");
-INSERT INTO t1 VALUES (2, "I hate testing.");
-UPDATE t1 SET id = 4 WHERE id = 2;
-DROP TABLE t1;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL,   `padding` VARCHAR(200) COLLATE utf8_general_ci NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
-COMMIT;
-START TRANSACTION;
-DROP TABLE `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL,   `padding` VARCHAR(200) COLLATE utf8_general_ci NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
-COMMIT;
-START TRANSACTION;
-DROP TABLE `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL,   `padding` VARCHAR(200) COLLATE utf8_general_ci NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
-COMMIT;
-START TRANSACTION;
-DROP TABLE `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL,   `padding` VARCHAR(200) COLLATE utf8_general_ci NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
-COMMIT;
-START TRANSACTION;
-ALTER TABLE t1 ADD dummy INT;
-COMMIT;
-START TRANSACTION;
-ALTER TABLE t1 ADD INDEX ix_padding (padding(20));
-COMMIT;
-START TRANSACTION;
-DROP TABLE `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE SCHEMA `my_new_warnings` COLLATE utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-DROP SCHEMA `my_new_warnings`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL,   `padding` VARCHAR(200) COLLATE utf8_general_ci NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-RENAME TABLE t1 TO t2;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL,   `padding` VARCHAR(200) COLLATE utf8_general_ci NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
-COMMIT;
-START TRANSACTION;
-DELETE FROM `test`.`t1` WHERE `id`=1;
-COMMIT;
-START TRANSACTION;
-DROP TABLE `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL,   `other` INT NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`other`) VALUES (1,1);
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`other`) VALUES (2,2);
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`other`) VALUES (3,3);
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`other`) VALUES (4,4);
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`other`) VALUES (5,5);
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`other`) VALUES (6,6);
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`other`) VALUES (7,7);
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`other`) VALUES (8,8);
-COMMIT;
-START TRANSACTION;
-DELETE FROM `test`.`t1` WHERE `id`=1;
-DELETE FROM `test`.`t1` WHERE `id`=2;
-DELETE FROM `test`.`t1` WHERE `id`=3;
-DELETE FROM `test`.`t1` WHERE `id`=4;
-DELETE FROM `test`.`t1` WHERE `id`=5;
-DELETE FROM `test`.`t1` WHERE `id`=6;
-DELETE FROM `test`.`t1` WHERE `id`=7;
-DELETE FROM `test`.`t1` WHERE `id`=8;
-COMMIT;
-START TRANSACTION;
-DROP TABLE `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL,   `padding` VARCHAR(200) COLLATE utf8_general_ci NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
-DELETE FROM `test`.`t1` WHERE `id`=1;
-COMMIT;
-START TRANSACTION;
-DROP TABLE `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL,   `padding` VARCHAR(200) COLLATE utf8_general_ci NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
-COMMIT;
-START TRANSACTION;
-UPDATE `test`.`t1` SET `padding`='XXX' WHERE `id`=1;
-COMMIT;
-START TRANSACTION;
-UPDATE `test`.`t1` SET `padding`='AAA' WHERE `id`=1;
-UPDATE `test`.`t1` SET `padding`='AAA' WHERE `id`=2;
-COMMIT;
-START TRANSACTION;
-DROP TABLE `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL AUTO_INCREMENT,   `name` VARCHAR(1024) COLLATE utf8_general_ci DEFAULT NULL,   `alias` VARCHAR(1024) COLLATE utf8_general_ci DEFAULT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`name`,`alias`) VALUES (1,'jeff lebowski','dude');
-COMMIT;
-START TRANSACTION;
-UPDATE `test`.`t1` SET `alias`='the dude' WHERE `id`=1;
-COMMIT;
-START TRANSACTION;
-DROP TABLE `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL,   `counter` INT NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`counter`) VALUES (1,1);
-INSERT INTO `test`.`t1` (`id`,`counter`) VALUES (2,2);
-INSERT INTO `test`.`t1` (`id`,`counter`) VALUES (3,3);
-COMMIT;
-START TRANSACTION;
-UPDATE `test`.`t1` SET `counter`=2 WHERE `id`=1;
-COMMIT;
-START TRANSACTION;
-UPDATE `test`.`t1` SET `counter`=3 WHERE `id`=2;
-UPDATE `test`.`t1` SET `counter`=4 WHERE `id`=3;
-COMMIT;
-START TRANSACTION;
-DROP TABLE `test`.`t1`;
-COMMIT;
-START TRANSACTION;
-CREATE TABLE `test`.`t1` (   `id` INT NOT NULL,   `padding` VARCHAR(200) COLLATE utf8_general_ci NOT NULL,   PRIMARY KEY (`id`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (1,'I love testing.');
-COMMIT;
-START TRANSACTION;
-INSERT INTO `test`.`t1` (`id`,`padding`) VALUES (2,'I hate testing.');
-COMMIT;
-START TRANSACTION;
-UPDATE `test`.`t1` SET `id`=4 WHERE `id`=2;
-COMMIT;
-START TRANSACTION;
-DROP TABLE `test`.`t1`;
-COMMIT;
-SET GLOBAL transaction_log_truncate_debug= true;

=== added file 'plugin/filtered_replicator/tests/r/var_filteredschemas.result'
--- plugin/filtered_replicator/tests/r/var_filteredschemas.result	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/r/var_filteredschemas.result	2011-01-10 18:00:22 +0000
@@ -0,0 +1,19 @@
+CREATE SCHEMA foo;
+CREATE SCHEMA bar;
+USE foo;
+CREATE TABLE foo1 (a INT NOT NULL PRIMARY KEY);
+INSERT INTO foo1 VALUES (1);
+UPDATE foo1 SET a = 2;
+DELETE FROM foo1;
+DROP SCHEMA foo;
+DROP SCHEMA bar;
+
+We should only see the 'bar' schema in the log
+
+START TRANSACTION;
+CREATE SCHEMA `bar` COLLATE utf8_general_ci;
+COMMIT;
+START TRANSACTION;
+DROP SCHEMA `bar`;
+COMMIT;
+SET GLOBAL transaction_log_truncate_debug= true;

=== added file 'plugin/filtered_replicator/tests/r/var_filteredtables.result'
--- plugin/filtered_replicator/tests/r/var_filteredtables.result	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/r/var_filteredtables.result	2011-01-10 18:00:22 +0000
@@ -0,0 +1,29 @@
+CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+UPDATE t1 SET a = 2;
+DELETE FROM t1;
+DROP TABLE t1;
+CREATE TABLE t2 (a INT NOT NULL PRIMARY KEY);
+INSERT INTO t2 VALUES (1);
+UPDATE t2 SET a = 2;
+DELETE FROM t2;
+DROP TABLE t2;
+
+We should only see events for t1 table in the log
+
+START TRANSACTION;
+CREATE TABLE `test`.`t1` (   `a` INT NOT NULL,   PRIMARY KEY (`a`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
+COMMIT;
+START TRANSACTION;
+INSERT INTO `test`.`t1` (`a`) VALUES (1);
+COMMIT;
+START TRANSACTION;
+UPDATE `test`.`t1` SET `a`=2 WHERE `a`=1;
+COMMIT;
+START TRANSACTION;
+DELETE FROM `test`.`t1` WHERE `a`=2;
+COMMIT;
+START TRANSACTION;
+DROP TABLE `test`.`t1`;
+COMMIT;
+SET GLOBAL transaction_log_truncate_debug= true;

=== added file 'plugin/filtered_replicator/tests/r/var_schemaregex.result'
--- plugin/filtered_replicator/tests/r/var_schemaregex.result	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/r/var_schemaregex.result	2011-01-10 18:00:22 +0000
@@ -0,0 +1,21 @@
+CREATE SCHEMA foo;
+CREATE SCHEMA foobar;
+CREATE SCHEMA bar;
+USE foobar;
+CREATE TABLE foo1 (a INT NOT NULL PRIMARY KEY);
+INSERT INTO foo1 VALUES (1);
+UPDATE foo1 SET a = 2;
+DELETE FROM foo1;
+DROP SCHEMA foo;
+DROP SCHEMA foobar;
+DROP SCHEMA bar;
+
+We should only see the 'bar' schema in the log
+
+START TRANSACTION;
+CREATE SCHEMA `bar` COLLATE utf8_general_ci;
+COMMIT;
+START TRANSACTION;
+DROP SCHEMA `bar`;
+COMMIT;
+SET GLOBAL transaction_log_truncate_debug= true;

=== added file 'plugin/filtered_replicator/tests/r/var_tableregex.result'
--- plugin/filtered_replicator/tests/r/var_tableregex.result	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/r/var_tableregex.result	2011-01-10 18:00:22 +0000
@@ -0,0 +1,31 @@
+CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+UPDATE t1 SET a = 2;
+DELETE FROM t1;
+DROP TABLE t1;
+CREATE TABLE junk (a INT NOT NULL PRIMARY KEY);
+INSERT INTO junk VALUES (1);
+UPDATE junk SET a = 2;
+DELETE FROM junk;
+DROP TABLE junk;
+CREATE TABLE junktesttable (a INT NOT NULL PRIMARY KEY);
+DROP TABLE junktesttable;
+
+We should only see events for t1 table in the log
+
+START TRANSACTION;
+CREATE TABLE `test`.`t1` (   `a` INT NOT NULL,   PRIMARY KEY (`a`) ) ENGINE=InnoDB COLLATE = utf8_general_ci;
+COMMIT;
+START TRANSACTION;
+INSERT INTO `test`.`t1` (`a`) VALUES (1);
+COMMIT;
+START TRANSACTION;
+UPDATE `test`.`t1` SET `a`=2 WHERE `a`=1;
+COMMIT;
+START TRANSACTION;
+DELETE FROM `test`.`t1` WHERE `a`=2;
+COMMIT;
+START TRANSACTION;
+DROP TABLE `test`.`t1`;
+COMMIT;
+SET GLOBAL transaction_log_truncate_debug= true;

=== removed file 'plugin/filtered_replicator/tests/t/filtered_replicator-master.opt'
--- plugin/filtered_replicator/tests/t/filtered_replicator-master.opt	2010-10-26 20:53:27 +0000
+++ plugin/filtered_replicator/tests/t/filtered_replicator-master.opt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---plugin-add=filtered_replicator --transaction-log.enable --transaction-log.use-replicator=filtered --scheduler=multi_thread --filtered-replicator.filteredschemas=notest

=== removed file 'plugin/filtered_replicator/tests/t/filtered_replicator.test'
--- plugin/filtered_replicator/tests/t/filtered_replicator.test	2010-11-15 16:08:56 +0000
+++ plugin/filtered_replicator/tests/t/filtered_replicator.test	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-# 
-# Holistic aggregate test case for the filtered replicator
-# plugin integration with the transaction_log module
-#
-# This file runs the tests in various .inc files. The
-# portions of the results that are non deterministic
-# are then removed for making a comparision to a 
-# result file.
-#
-#
-
-# Ignore startup/shutdown events
---disable_query_log
---source ../plugin/transaction_log/tests/t/truncate_log.inc
---enable_query_log
-
-# Filter all statements involving tables called "t2"
-set global filtered_replicator_filteredtables=t2;
-
---source ../plugin/transaction_log/tests/t/insert.inc
---source ../plugin/transaction_log/tests/t/insert_multi.inc
---source ../plugin/transaction_log/tests/t/insert_select.inc
---source ../plugin/transaction_log/tests/t/alter.inc
---source ../plugin/transaction_log/tests/t/schema.inc
---source ../plugin/transaction_log/tests/t/rename.inc
---source ../plugin/transaction_log/tests/t/delete.inc
---source ../plugin/transaction_log/tests/t/update.inc
-#--source ../plugin/transaction_log/tests/t/auto_commit.inc
-#--source ../plugin/transaction_log/tests/t/temp_tables.inc
-
-# MySQL Bug 36763
-#--source ../plugin/transaction_log/tests/t/truncate.inc
-# Needs fixing
-#--source ../plugin/transaction_log/tests/t/rand.inc
-
-# Read in the transaction.log.
-
---exec ../plugin/transaction_log/utilities/transaction_reader var/master-data/local/transaction.log
-
-# Truncate the log file to reset for the next test
---source ../plugin/transaction_log/tests/t/truncate_log.inc

=== added file 'plugin/filtered_replicator/tests/t/var_filteredschemas-master.opt'
--- plugin/filtered_replicator/tests/t/var_filteredschemas-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/t/var_filteredschemas-master.opt	2011-01-10 18:00:22 +0000
@@ -0,0 +1,1 @@
+--plugin-add=filtered_replicator --transaction-log.enable --transaction-log.use-replicator=filtered --filtered-replicator.filteredschemas=foo

=== added file 'plugin/filtered_replicator/tests/t/var_filteredschemas.test'
--- plugin/filtered_replicator/tests/t/var_filteredschemas.test	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/t/var_filteredschemas.test	2011-01-10 18:00:22 +0000
@@ -0,0 +1,23 @@
+# Test of the filteredschemas variable
+
+# Ignore startup/shutdown events
+--disable_query_log
+--source ../plugin/transaction_log/tests/t/truncate_log.inc
+--enable_query_log
+
+CREATE SCHEMA foo;
+CREATE SCHEMA bar;
+USE foo;
+CREATE TABLE foo1 (a INT NOT NULL PRIMARY KEY);
+INSERT INTO foo1 VALUES (1);
+UPDATE foo1 SET a = 2;
+DELETE FROM foo1;
+DROP SCHEMA foo;
+DROP SCHEMA bar;
+
+--echo
+--echo We should only see the 'bar' schema in the log
+--echo
+--exec ../plugin/transaction_log/utilities/transaction_reader var/master-data/local/transaction.log
+
+--source ../plugin/transaction_log/tests/t/truncate_log.inc

=== added file 'plugin/filtered_replicator/tests/t/var_filteredtables-master.opt'
--- plugin/filtered_replicator/tests/t/var_filteredtables-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/t/var_filteredtables-master.opt	2011-01-10 18:00:22 +0000
@@ -0,0 +1,1 @@
+--plugin-add=filtered_replicator --transaction-log.enable --transaction-log.use-replicator=filtered --filtered-replicator.filteredtables=t2

=== added file 'plugin/filtered_replicator/tests/t/var_filteredtables.test'
--- plugin/filtered_replicator/tests/t/var_filteredtables.test	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/t/var_filteredtables.test	2011-01-10 18:00:22 +0000
@@ -0,0 +1,34 @@
+# Test of the filteredtables variable
+# Tables named 't2' should be filtered
+
+# Ignore startup/shutdown events
+--disable_query_log
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+--enable_warnings
+
+--source ../plugin/transaction_log/tests/t/truncate_log.inc
+--enable_query_log
+
+CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+UPDATE t1 SET a = 2;
+DELETE FROM t1;
+DROP TABLE t1;
+
+CREATE TABLE t2 (a INT NOT NULL PRIMARY KEY);
+INSERT INTO t2 VALUES (1);
+UPDATE t2 SET a = 2;
+DELETE FROM t2;
+DROP TABLE t2;
+
+--echo
+--echo We should only see events for t1 table in the log
+--echo
+--replace_regex /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g/creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/ /transaction_id: [0-9]+/TRANSACTION_ID/
+
+--exec ../plugin/transaction_log/utilities/transaction_reader var/master-data/local/transaction.log
+
+--source ../plugin/transaction_log/tests/t/truncate_log.inc

=== added file 'plugin/filtered_replicator/tests/t/var_schemaregex-master.opt'
--- plugin/filtered_replicator/tests/t/var_schemaregex-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/t/var_schemaregex-master.opt	2011-01-10 18:00:22 +0000
@@ -0,0 +1,1 @@
+--plugin-add=filtered_replicator --transaction-log.enable --transaction-log.use-replicator=filtered --filtered-replicator.schemaregex="foo*"

=== added file 'plugin/filtered_replicator/tests/t/var_schemaregex.test'
--- plugin/filtered_replicator/tests/t/var_schemaregex.test	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/t/var_schemaregex.test	2011-01-10 18:00:22 +0000
@@ -0,0 +1,26 @@
+# Test of the schemaregex variable
+# Schemas matching "foo*" should be excluded
+
+# Ignore startup/shutdown events
+--disable_query_log
+--source ../plugin/transaction_log/tests/t/truncate_log.inc
+--enable_query_log
+
+CREATE SCHEMA foo;
+CREATE SCHEMA foobar;
+CREATE SCHEMA bar;
+USE foobar;
+CREATE TABLE foo1 (a INT NOT NULL PRIMARY KEY);
+INSERT INTO foo1 VALUES (1);
+UPDATE foo1 SET a = 2;
+DELETE FROM foo1;
+DROP SCHEMA foo;
+DROP SCHEMA foobar;
+DROP SCHEMA bar;
+
+--echo
+--echo We should only see the 'bar' schema in the log
+--echo
+--exec ../plugin/transaction_log/utilities/transaction_reader var/master-data/local/transaction.log
+
+--source ../plugin/transaction_log/tests/t/truncate_log.inc

=== added file 'plugin/filtered_replicator/tests/t/var_tableregex-master.opt'
--- plugin/filtered_replicator/tests/t/var_tableregex-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/t/var_tableregex-master.opt	2011-01-10 18:00:22 +0000
@@ -0,0 +1,1 @@
+--plugin-add=filtered_replicator --transaction-log.enable --transaction-log.use-replicator=filtered --filtered-replicator.tableregex="junk*"

=== added file 'plugin/filtered_replicator/tests/t/var_tableregex.test'
--- plugin/filtered_replicator/tests/t/var_tableregex.test	1970-01-01 00:00:00 +0000
+++ plugin/filtered_replicator/tests/t/var_tableregex.test	2011-01-10 18:00:22 +0000
@@ -0,0 +1,37 @@
+# Test of the filteredtables variable
+# Tables matching "junk*" will be excluded
+
+# Ignore startup/shutdown events
+--disable_query_log
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+--enable_warnings
+
+--source ../plugin/transaction_log/tests/t/truncate_log.inc
+--enable_query_log
+
+CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY);
+INSERT INTO t1 VALUES (1);
+UPDATE t1 SET a = 2;
+DELETE FROM t1;
+DROP TABLE t1;
+
+CREATE TABLE junk (a INT NOT NULL PRIMARY KEY);
+INSERT INTO junk VALUES (1);
+UPDATE junk SET a = 2;
+DELETE FROM junk;
+DROP TABLE junk;
+
+CREATE TABLE junktesttable (a INT NOT NULL PRIMARY KEY);
+DROP TABLE junktesttable;
+
+--echo
+--echo We should only see events for t1 table in the log
+--echo
+--replace_regex /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g/creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/ /transaction_id: [0-9]+/TRANSACTION_ID/
+
+--exec ../plugin/transaction_log/utilities/transaction_reader var/master-data/local/transaction.log
+
+--source ../plugin/transaction_log/tests/t/truncate_log.inc