summaryrefslogtreecommitdiff
path: root/mysql-test/main/type_varchar.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-07-01 18:37:15 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-07-01 18:37:15 +0300
commit9c16460e63a5002d5949f67f57dce71e666547ec (patch)
treebb29fe94f869d828ed5768dbc72021d1911e2831 /mysql-test/main/type_varchar.result
parent747dccfe23e46b928b005669124e7ad94a1fdefb (diff)
parent0e1ba364a12b6569c75a7dadc38b7ef2b4910d34 (diff)
downloadmariadb-git-9c16460e63a5002d5949f67f57dce71e666547ec.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/type_varchar.result')
-rw-r--r--mysql-test/main/type_varchar.result18
1 files changed, 17 insertions, 1 deletions
diff --git a/mysql-test/main/type_varchar.result b/mysql-test/main/type_varchar.result
index 8911d36a020..cec279913b4 100644
--- a/mysql-test/main/type_varchar.result
+++ b/mysql-test/main/type_varchar.result
@@ -687,7 +687,23 @@ DROP TABLE t1,t2;
# End of 10.0 tests
#
#
-# Start of 10.4 tests
+# MDEV-17551
+# Assertion `(&(&share->intern_lock)->m_mutex)->count > 0 &&
+# pthread_equal(pthread_self(), (&(&share->intern_lock)->m_mutex)->
+# thread)' failed in _ma_state_info_write or ER_CRASHED_ON_USAGE
+# upon SELECT with UNION
+#
+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;
+f1 f2
+foo bar
+foobar foobar
+DROP TABLE t1;
+#
+# End of 10.3 tests
#
SET sql_mode='';
CREATE TABLE t1 (c VARCHAR(1) DEFAULT 'foo');