summaryrefslogtreecommitdiff
path: root/mysql-test/main
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2022-07-26 21:24:01 -0700
committerIgor Babaev <igor@askmonty.org>2023-03-15 17:35:22 -0700
commit9f796526258ae17f441c5552f45bda57dab530e8 (patch)
treeb8018d7f1cf99226b553923a2a4e9c43d2b2742d /mysql-test/main
parent88ca62dc689fa66d798c129a101069946acc828c (diff)
downloadmariadb-git-9f796526258ae17f441c5552f45bda57dab530e8.tar.gz
Assertion failure with UPDATE of view using MERGE table
The problem was caused by an assertion that is not valid anymore.
Diffstat (limited to 'mysql-test/main')
-rw-r--r--mysql-test/main/merge.result12
-rw-r--r--mysql-test/main/merge.test15
2 files changed, 20 insertions, 7 deletions
diff --git a/mysql-test/main/merge.result b/mysql-test/main/merge.result
index 1eecb3e34ca..7144fd1d349 100644
--- a/mysql-test/main/merge.result
+++ b/mysql-test/main/merge.result
@@ -3898,9 +3898,6 @@ DROP TABLE t1;
DROP TABLE m1;
set global default_storage_engine=@save_default_storage_engine;
#
-# End of 10.0 tests
-#
-#
# MDEV-27407 Different ASC/DESC index attributes on MERGE and underlying table can cause wrong results
#
create table t (a int, key(a desc)) engine=myisam;
@@ -3967,3 +3964,12 @@ DROP TABLE tm, t1, t2;
#
# End of 11.0 tests
#
+#
+# MDEV-29174: UPDATE of view that uses MERGE table
+#
+CREATE TABLE t1 (a int) ENGINE=MERGE;
+CREATE VIEW v1 AS SELECT a FROM t1;
+UPDATE v1 SET a=0;
+DROP VIEW v1;
+DROP TABLE t1;
+# End of 11.1 tests
diff --git a/mysql-test/main/merge.test b/mysql-test/main/merge.test
index 6b88d427fb4..f8f421994e9 100644
--- a/mysql-test/main/merge.test
+++ b/mysql-test/main/merge.test
@@ -2860,10 +2860,6 @@ set global default_storage_engine=@save_default_storage_engine;
--source include/wait_until_count_sessions.inc
--echo #
---echo # End of 10.0 tests
---echo #
-
---echo #
--echo # MDEV-27407 Different ASC/DESC index attributes on MERGE and underlying table can cause wrong results
--echo #
create table t (a int, key(a desc)) engine=myisam;
@@ -2925,3 +2921,14 @@ DROP TABLE tm, t1, t2;
--echo #
--echo # End of 11.0 tests
--echo #
+--echo #
+--echo # MDEV-29174: UPDATE of view that uses MERGE table
+--echo #
+
+CREATE TABLE t1 (a int) ENGINE=MERGE;
+CREATE VIEW v1 AS SELECT a FROM t1;
+UPDATE v1 SET a=0;
+DROP VIEW v1;
+DROP TABLE t1;
+
+--echo # End of 11.1 tests