3 files changed, 45 insertions, 0 deletions
diff --git a/mysql-test/suite/bugs/r/rpl_bug31582.result b/mysql-test/suite/bugs/r/rpl_bug31582.result
new file mode 100644
index 00000000000..1f71fbf8fe7
--- /dev/null
+++ b/mysql-test/suite/bugs/r/rpl_bug31582.result
@@ -0,0 +1,16 @@
+stop slave;
+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;
+start slave;
+CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('a');
+UPDATE t1 SET a = 'MyISAM';
+SELECT * FROM t1 ORDER BY a;
+a
+MyISAM
+SELECT * FROM t1 ORDER BY a;
+a
+MyISAM
+DROP TABLE t1;
diff --git a/mysql-test/suite/bugs/t/rpl_bug31582.test b/mysql-test/suite/bugs/t/rpl_bug31582.test
new file mode 100644
index 00000000000..7ba15eec8ce
--- /dev/null
+++ b/mysql-test/suite/bugs/t/rpl_bug31582.test
@@ -0,0 +1,25 @@
+
+# BUG#31582: 5.1-telco-6.1 -> 5.1.22. Slave crashes when reading
+#            UPDATE for VARCHAR
+
+# This is a problem for any update statement replicating from an old
+# server to a new server. The bug consisted of a new slave trying to
+# read two column bitmaps, but there is only one available in the old
+# format.
+
+# This test case should be executed replicating from an old server to
+# a new server, so make sure you have one handy.
+
+source include/master-slave.inc;
+
+CREATE TABLE t1 (a VARCHAR(10) PRIMARY KEY) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('a');
+UPDATE t1 SET a = 'MyISAM';
+SELECT * FROM t1 ORDER BY a;
+sync_slave_with_master;
+SELECT * FROM t1 ORDER BY a;
+
+connection master;
+DROP TABLE t1;
+sync_slave_with_master;
+
diff --git a/mysql-test/suite/bugs/t/rpl_bug31583.test b/mysql-test/suite/bugs/t/rpl_bug31583.test
index a8f4a5538ca..657e4984b77 100644
--- a/mysql-test/suite/bugs/t/rpl_bug31583.test
+++ b/mysql-test/suite/bugs/t/rpl_bug31583.test
@@ -19,3 +19,7 @@ SELECT * FROM t1 ORDER BY a;
 sync_slave_with_master;
 SELECT * FROM t1 ORDER BY a;
 
+connection master;
+DROP TABLE t1;
+sync_slave_with_master;
+