diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-01 18:37:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-01 18:37:15 +0300 |
| commit | 9c16460e63a5002d5949f67f57dce71e666547ec (patch) | |
| tree | bb29fe94f869d828ed5768dbc72021d1911e2831 /mysql-test/main | |
| parent | 747dccfe23e46b928b005669124e7ad94a1fdefb (diff) | |
| parent | 0e1ba364a12b6569c75a7dadc38b7ef2b4910d34 (diff) | |
| download | mariadb-git-9c16460e63a5002d5949f67f57dce71e666547ec.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/type_varchar.result | 18 | ||||
| -rw-r--r-- | mysql-test/main/type_varchar.test | 16 |
2 files changed, 32 insertions, 2 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'); diff --git a/mysql-test/main/type_varchar.test b/mysql-test/main/type_varchar.test index 86f16afc56f..9d0ad8a128b 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=''; |