summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria/r/maria.result
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-08-07 18:03:04 +0300
committerMichael Widenius <monty@askmonty.org>2010-08-07 18:03:04 +0300
commit3bb2045fe12fa4ee8af11b9ff38cee39e67de67a (patch)
treebe710be5d041c526443027cd51b0afb710f13a89 /mysql-test/suite/maria/r/maria.result
parent165eb1186cb6f8e9a9595ffd7c172c54a6dfb6dc (diff)
parent0d3039d49daa7e274d66db808b15eebe8cbd778e (diff)
downloadmariadb-git-3bb2045fe12fa4ee8af11b9ff38cee39e67de67a.tar.gz
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
Diffstat (limited to 'mysql-test/suite/maria/r/maria.result')
-rw-r--r--mysql-test/suite/maria/r/maria.result11
1 files changed, 11 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;