database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

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

Browse Source 
Fixed test case to test for virtual columns
This commit is contained in:
Michael Widenius
2010-08-07 18:03:04 +03:00
parent 165eb1186c 0d3039d49d
commit 3bb2045fe1
20 changed files with 101 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/maria/r/maria.result
View File

@@ -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;

17
mysql-test/suite/maria/t/maria.test
View File

@@ -1893,6 +1893,23 @@ INSERT t1 ( f4 , f2 ) VALUES ( 4 , 92 ) ;
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
#

2
mysql-test/suite/percona/percona_log_slow_slave_statements-and-use_global_long_query_time.test
View File

@@ -1,3 +1,5 @@
-- source include/not_windows.inc
-- echo # Activate master-slave replication
-- source include/master-slave.inc

2
mysql-test/suite/percona/percona_log_slow_slave_statements.test
View File

@@ -1,3 +1,5 @@
-- source include/not_windows.inc
-- echo # Activate master-slave replication
-- source include/master-slave.inc

2
mysql-test/suite/percona/percona_slow_query_log-control_global_slow.test
View File

@@ -1,3 +1,5 @@
--source include/not_windows.inc
source include/have_innodb.inc;
SELECT sleep(2);
set global log_slow_verbosity=innodb;

2
mysql-test/suite/percona/percona_slow_query_log-log_slow_filter.test
View File

@@ -1,3 +1,5 @@
-- source include/not_windows.inc
source include/have_innodb.inc;
SET GLOBAL SLOW_QUERY_LOG=OFF;

2
mysql-test/suite/percona/percona_slow_query_log-log_slow_verbosity.test
View File

@@ -1,3 +1,5 @@
-- source include/not_windows.inc
source include/have_innodb.inc;
SELECT sleep(2);

1
mysql-test/suite/percona/percona_slow_query_log-long_query_time.test
View File

@@ -1,3 +1,4 @@
source include/not_windows.inc;
source include/have_innodb.inc;
SELECT sleep(1);

1
mysql-test/suite/percona/percona_slow_query_log-microseconds_in_slow_query_log.test
View File

@@ -1,3 +1,4 @@
source include/not_windows.inc;
source include/have_innodb.inc;
SELECT sleep(2);

1
mysql-test/suite/percona/percona_slow_query_log-min_examined_row_limit.test
View File

@@ -1,3 +1,4 @@
source include/not_windows.inc;
source include/have_innodb.inc;
SET GLOBAL SLOW_QUERY_LOG=OFF;

1
mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test
View File

@@ -1,3 +1,4 @@
source include/not_windows.inc;
source include/have_innodb.inc;
SELECT sleep(1);