diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-23 08:06:17 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-23 08:06:17 +0300 |
commit | efb8485d85b19a2a729310adc6779ca649198f29 (patch) | |
tree | a2b7778acfecd95d2f5b1fcff588d93268afa112 /mysql-test/main/type_int.test | |
parent | 235cf969d21ba3406a9325d952fda47c589e58d6 (diff) | |
parent | b96e4424fb4d35dd5de52f44ed6b726a3f0dd010 (diff) | |
download | mariadb-git-efb8485d85b19a2a729310adc6779ca649198f29.tar.gz |
Merge 10.3 into 10.4, except for MDEV-20265
The MDEV-20265 commit e746f451d57def4be679caafc29976741b3e89f7
introduces DBUG_ASSERT(right_op == r_tbl) in
st_select_lex::add_cross_joined_table(), and that assertion would
fail in several tests that exercise joins. That commit was skipped
in this merge, and a separate fix of MDEV-20265 will be necessary in 10.4.
Diffstat (limited to 'mysql-test/main/type_int.test')
-rw-r--r-- | mysql-test/main/type_int.test | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/main/type_int.test b/mysql-test/main/type_int.test index ea662254efb..748ba3c3c52 100644 --- a/mysql-test/main/type_int.test +++ b/mysql-test/main/type_int.test @@ -1,4 +1,25 @@ --echo # +--echo # Start of 5.5 tests +--echo # + +--echo # +--echo # MDEV-15955 Assertion `field_types == 0 || field_types[field_pos] == MYSQL_TYPE_LONGLONG' failed in Protocol_text::store_longlong +--echo # + +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1),(2); +SELECT @a := 1 FROM t1 ORDER BY STRCMP(STDDEV_SAMP(a), 'bar'); +SELECT COALESCE(1) FROM t1 ORDER BY STRCMP(STDDEV_SAMP(a), 'bar'); +SELECT COALESCE(@a:=1) FROM t1 ORDER BY STRCMP(STDDEV_SAMP(a), 'bar'); +SELECT COALESCE(@a) FROM t1 ORDER BY STRCMP(STDDEV_SAMP(a), 'bar'); +DROP TABLE t1; + +--echo # +--echo # End of 5.5 tests +--echo # + + +--echo # --echo # Start of 10.1 tests --echo # |