Merge with 5.1 to get bug fix for LP#613408 Memory corruption with (M)aria storage engine and virtual columns

Fixed test case to test for virtual columns

11 files changed, 42 insertions, 0 deletions

diff --git a/mysql-test/suite/maria/r/maria.result b/mysql-test/suite/maria/r/maria.result
index 76a115982f0..7616f5dbff4 100644
--- a/mysql-test/suite/maria/r/maria.result
+++ b/mysql-test/suite/maria/r/maria.result
@@ -2613,3 +2613,14 @@ INSERT t1 ( f1 , f2 , f3 , f4 ) VALUES ( 0 , f2 , 8 , f3 ) ;
 INSERT t1 ( f4 , f2 ) VALUES ( 4 , 92 ) ;
 DELETE FROM t1 WHERE v3 = 173 OR v4 = 9 ;
 drop table t1;
+CREATE TABLE t1 (
+f1 CHAR(255) BINARY ,
+f2 CHAR(255) BINARY NOT NULL DEFAULT '0',
+f3 CHAR(255) BINARY NOT NULL ,
+f4 CHAR(255) BINARY NOT NULL DEFAULT '0' ,
+v3 CHAR(255) BINARY AS ( ( f1 NOT LIKE '%' ) ) PERSISTENT,
+KEY (v3)
+) ENGINE=Maria;
+INSERT INTO t1 ( f1 , f2 , f3 , f4 ) SELECT f1 , f4 , f1 , f4 FROM t1;
+DELETE FROM t1;
+drop table t1;
diff --git a/mysql-test/suite/maria/t/maria.test b/mysql-test/suite/maria/t/maria.test
index a4498070390..664bcb372ca 100644
--- a/mysql-test/suite/maria/t/maria.test
+++ b/mysql-test/suite/maria/t/maria.test
@@ -1894,6 +1894,23 @@ DELETE FROM t1 WHERE v3 = 173 OR v4 = 9 ;
 drop table t1;
 
 #
+# Test for LP#61465 Memory corruption with (M)aria storage engine and
+# virtual columns
+#
+
+CREATE TABLE t1 (
+         f1 CHAR(255) BINARY ,
+         f2 CHAR(255) BINARY NOT NULL DEFAULT '0',
+         f3 CHAR(255) BINARY NOT NULL ,
+         f4 CHAR(255) BINARY NOT NULL DEFAULT '0' ,
+         v3 CHAR(255) BINARY AS ( ( f1 NOT LIKE '%' ) ) PERSISTENT,
+         KEY (v3)
+) ENGINE=Maria;
+INSERT INTO t1 ( f1 , f2 , f3 , f4 ) SELECT f1 , f4 , f1 , f4 FROM t1;
+DELETE FROM t1;
+drop table t1;
+
+#
 # End of test
 #
 # Set defaults back
diff --git a/mysql-test/suite/percona/percona_log_slow_slave_statements-and-use_global_long_query_time.test b/mysql-test/suite/percona/percona_log_slow_slave_statements-and-use_global_long_query_time.test
index 7605218e463..8d4bb1e091c 100644
--- a/mysql-test/suite/percona/percona_log_slow_slave_statements-and-use_global_long_query_time.test
+++ b/mysql-test/suite/percona/percona_log_slow_slave_statements-and-use_global_long_query_time.test
@@ -1,3 +1,5 @@
+-- source include/not_windows.inc
+
 -- echo # Activate master-slave replication
 -- source include/master-slave.inc
 
diff --git a/mysql-test/suite/percona/percona_log_slow_slave_statements.test b/mysql-test/suite/percona/percona_log_slow_slave_statements.test
index 37cb1ad2419..8c9c594e41c 100644
--- a/mysql-test/suite/percona/percona_log_slow_slave_statements.test
+++ b/mysql-test/suite/percona/percona_log_slow_slave_statements.test
@@ -1,3 +1,5 @@
+-- source include/not_windows.inc
+
 -- echo # Activate master-slave replication
 -- source include/master-slave.inc
 
diff --git a/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test b/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test
index 79b94825821..1c3dc937937 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test
@@ -1,3 +1,5 @@
+--source include/not_windows.inc
+
 source include/have_innodb.inc;
 SELECT sleep(2);
 set global log_slow_verbosity=innodb;
diff --git a/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test b/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test
index 843567ae11a..44646de530a 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test
@@ -1,3 +1,5 @@
+-- source include/not_windows.inc
+
 source include/have_innodb.inc;
 
 SET GLOBAL SLOW_QUERY_LOG=OFF;
diff --git a/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test b/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test
index 62717c4ed6e..d1dc324fced 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test
@@ -1,3 +1,5 @@
+-- source include/not_windows.inc
+
 source include/have_innodb.inc;
 
 SELECT sleep(2);
diff --git a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test
index 55f3e61cd09..4161690e2ef 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-long_query_time.test
@@ -1,3 +1,4 @@
+source include/not_windows.inc;
 source include/have_innodb.inc;
 
 SELECT sleep(1);
diff --git a/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test b/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test
index 67bf49400fa..bceada68d79 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test
@@ -1,3 +1,4 @@
+source include/not_windows.inc;
 source include/have_innodb.inc;
 
 SELECT sleep(2);
diff --git a/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test b/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test
index 28287c4bcb2..61276423b4d 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test
@@ -1,3 +1,4 @@
+source include/not_windows.inc;
 source include/have_innodb.inc;
 
 SET GLOBAL SLOW_QUERY_LOG=OFF;
diff --git a/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test b/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test
index 397526fccdd..70021da1e4c 100644
--- a/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test
+++ b/mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test
@@ -1,3 +1,4 @@
+source include/not_windows.inc;
 source include/have_innodb.inc;
 
 SELECT sleep(1);