summaryrefslogtreecommitdiff
path: root/mysql-test/main/type_varchar.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-08-13 18:57:00 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-08-13 18:57:00 +0300
commit624dd71b9419555eca8baadc695e3376de72286f (patch)
tree31aaab8aeac43f921638407ab82190dd05a72793 /mysql-test/main/type_varchar.test
parentd4d865fcc8083782b6e4419c69bec372cd0b4142 (diff)
parente9c1701e11e2441435223cc7c00c467f58aaff19 (diff)
downloadmariadb-git-624dd71b9419555eca8baadc695e3376de72286f.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/type_varchar.test')
-rw-r--r--mysql-test/main/type_varchar.test16
1 files changed, 15 insertions, 1 deletions
diff --git a/mysql-test/main/type_varchar.test b/mysql-test/main/type_varchar.test
index ab02549394a..f63523e226b 100644
--- a/mysql-test/main/type_varchar.test
+++ b/mysql-test/main/type_varchar.test
@@ -329,9 +329,23 @@ DROP TABLE t1,t2;
--echo # End of 10.0 tests
--echo #
+--echo #
+--echo # MDEV-17551
+--echo # Assertion `(&(&share->intern_lock)->m_mutex)->count > 0 &&
+--echo # pthread_equal(pthread_self(), (&(&share->intern_lock)->m_mutex)->
+--echo # thread)' failed in _ma_state_info_write or ER_CRASHED_ON_USAGE
+--echo # upon SELECT with UNION
+--echo #
+
+CREATE TABLE t1 (b BLOB, vb BLOB AS (b) VIRTUAL);
+INSERT INTO t1 (b) VALUES ('foobar');
+SELECT 'foo' AS f1, CONVERT( 'bar' USING latin1 ) AS f2 FROM t1
+ UNION
+SELECT b AS f1, CONVERT( vb USING latin1 ) AS f2 FROM t1;
+DROP TABLE t1;
--echo #
---echo # Start of 10.4 tests
+--echo # End of 10.3 tests
--echo #
SET sql_mode='';