summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2021-08-02 10:30:18 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2021-08-02 10:30:18 +0200
commit8b6c8a6ce96c2c8ce6fde16049fcd60eb1547aed (patch)
tree708cf8ba85ac5d07a0ca1ad135d64d575294ce1a /mysql-test/suite
parent2cdf8a932737f5128004742cafbd3d3bb1df14a2 (diff)
downloadmariadb-git-8b6c8a6ce96c2c8ce6fde16049fcd60eb1547aed.tar.gz
Revert "MDEV-26220 Server crashes with indexed by prefix virtual column"
This reverts commit 9b8e207ce03b2ab7a766348738055be9520561bd.
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/gcol/inc/gcol_partition.inc12
-rw-r--r--mysql-test/suite/gcol/r/gcol_partition_innodb.result11
-rw-r--r--mysql-test/suite/gcol/r/gcol_partition_myisam.result11
3 files changed, 0 insertions, 34 deletions
diff --git a/mysql-test/suite/gcol/inc/gcol_partition.inc b/mysql-test/suite/gcol/inc/gcol_partition.inc
index 50a743c0153..4e4af4f0023 100644
--- a/mysql-test/suite/gcol/inc/gcol_partition.inc
+++ b/mysql-test/suite/gcol/inc/gcol_partition.inc
@@ -169,15 +169,3 @@ CREATE TABLE t1 (
INSERT INTO t1 () VALUES (),();
UPDATE t1 SET a = 0 WHERE b IS NULL ORDER BY pk;
DROP TABLE t1;
-
---echo #
---echo # MDEV-26220 Server crashes with indexed by prefix virtual column
---echo #
-
-CREATE TABLE t1 (pk INT PRIMARY KEY, a INT, b CHAR(20), c CHAR(20) AS (b),
- KEY (c(10),a)) PARTITION BY HASH(pk);
-INSERT INTO t1 (pk,a,b) VALUES (1,10,'foo'),(2,11,'baz');
-SELECT a FROM t1;
-
-# Cleanup
-DROP TABLE t1;
diff --git a/mysql-test/suite/gcol/r/gcol_partition_innodb.result b/mysql-test/suite/gcol/r/gcol_partition_innodb.result
index e61c0a26417..d3f211c9b9a 100644
--- a/mysql-test/suite/gcol/r/gcol_partition_innodb.result
+++ b/mysql-test/suite/gcol/r/gcol_partition_innodb.result
@@ -104,17 +104,6 @@ INSERT INTO t1 () VALUES (),();
UPDATE t1 SET a = 0 WHERE b IS NULL ORDER BY pk;
DROP TABLE t1;
#
-# MDEV-26220 Server crashes with indexed by prefix virtual column
-#
-CREATE TABLE t1 (pk INT PRIMARY KEY, a INT, b CHAR(20), c CHAR(20) AS (b),
-KEY (c(10),a)) PARTITION BY HASH(pk);
-INSERT INTO t1 (pk,a,b) VALUES (1,10,'foo'),(2,11,'baz');
-SELECT a FROM t1;
-a
-11
-10
-DROP TABLE t1;
-#
# MDEV-16980 Wrongly set tablename len while opening the
# table for purge thread
#
diff --git a/mysql-test/suite/gcol/r/gcol_partition_myisam.result b/mysql-test/suite/gcol/r/gcol_partition_myisam.result
index e54b0ad83c6..75e216f903b 100644
--- a/mysql-test/suite/gcol/r/gcol_partition_myisam.result
+++ b/mysql-test/suite/gcol/r/gcol_partition_myisam.result
@@ -101,17 +101,6 @@ KEY (b,d)
INSERT INTO t1 () VALUES (),();
UPDATE t1 SET a = 0 WHERE b IS NULL ORDER BY pk;
DROP TABLE t1;
-#
-# MDEV-26220 Server crashes with indexed by prefix virtual column
-#
-CREATE TABLE t1 (pk INT PRIMARY KEY, a INT, b CHAR(20), c CHAR(20) AS (b),
-KEY (c(10),a)) PARTITION BY HASH(pk);
-INSERT INTO t1 (pk,a,b) VALUES (1,10,'foo'),(2,11,'baz');
-SELECT a FROM t1;
-a
-11
-10
-DROP TABLE t1;
DROP VIEW IF EXISTS v1,v2;
DROP TABLE IF EXISTS t1,t2,t3;
DROP PROCEDURE IF EXISTS p1;