summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-06-11 16:25:18 +0300
committerunknown <bell@sanja.is.com.ua>2004-06-11 16:25:18 +0300
commitd4c72a852d6e554d606f8b40bdeb464b6b6f7855 (patch)
treed09637a1d1a3a01fbff5f718bfd5f58d95948d32
parent2df0588981c68f2e1fc7b1a826b06c395fcd9f12 (diff)
downloadmariadb-git-d4c72a852d6e554d606f8b40bdeb464b6b6f7855.tar.gz
test suite for bug Bug#3969 (commited separetely because it took too long time to parse it on 3.23)
client/mysqltest.c: allow big commands in mysql-test
-rw-r--r--client/mysqltest.c2
-rw-r--r--mysql-test/r/rpl_free_items.result10
-rw-r--r--mysql-test/t/rpl_free_items-slave.opt1
-rw-r--r--mysql-test/t/rpl_free_items.test20
4 files changed, 32 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 22ce5208445..68b9dd505b2 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -59,7 +59,7 @@
#include <sys/stat.h>
#include <violite.h>
-#define MAX_QUERY 65536
+#define MAX_QUERY 131072
#define MAX_COLUMNS 256
#define PAD_SIZE 128
#define MAX_CONS 128
diff --git a/mysql-test/r/rpl_free_items.result b/mysql-test/r/rpl_free_items.result
new file mode 100644
index 00000000000..743fbbc8fc7
--- /dev/null
+++ b/mysql-test/r/rpl_free_items.result
@@ -0,0 +1,10 @@
+slave stop;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+slave start;
+create table t1 (a int);
+create table t2 (a int);
+drop table t1;
+drop table t2;
diff --git a/mysql-test/t/rpl_free_items-slave.opt b/mysql-test/t/rpl_free_items-slave.opt
new file mode 100644
index 00000000000..b828d03fafb
--- /dev/null
+++ b/mysql-test/t/rpl_free_items-slave.opt
@@ -0,0 +1 @@
+--replicate-wild-ignore-table=test.%
diff --git a/mysql-test/t/rpl_free_items.test b/mysql-test/t/rpl_free_items.test
new file mode 100644
index 00000000000..3228ffd9cde
--- /dev/null
+++ b/mysql-test/t/rpl_free_items.test
@@ -0,0 +1,20 @@
+source include/master-slave.inc;
+create table t1 (a int);
+create table t2 (a int);
+disable_query_log;
+SET @query="INSERT INTO t2 SELECT * FROM t1 WHERE a REGEXP \"0\"";
+let $1 = 2000;
+while ($1)
+{
+ eval SET @query=concat(@query, " OR a REGEXP '$1'");
+ dec $1;
+}
+let $1=`select @query`;
+eval $1;
+enable_query_log;
+# I have seen the slave crash either now or at shutdown
+sync_slave_with_master;
+connection master;
+drop table t1;
+drop table t2;
+sync_slave_with_master;