diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-08-07 21:35:34 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-08-07 21:35:34 +0400 |
| commit | 988a9daa945ce86737397e65757a85213abbb206 (patch) | |
| tree | 4e21eec3dee2d7b87bdd3d6cc00988e98eba59f1 /mysql-test/r/win.result | |
| parent | 0f1cadd9a5e6e8aa2103100502b0a5b4227e8d7b (diff) | |
| parent | 30c36b2c150d6bf52e56abfbef755119fbc773f9 (diff) | |
| download | mariadb-git-988a9daa945ce86737397e65757a85213abbb206.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
mysql-test/r/func_json.result
mysql-test/r/win.result
mysql-test/t/func_json.test
mysql-test/t/win.test
sql/share/errmsg-utf8.txt
storage/rocksdb/ha_rocksdb.cc
storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result
Diffstat (limited to 'mysql-test/r/win.result')
| -rw-r--r-- | mysql-test/r/win.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/win.result b/mysql-test/r/win.result index d5b79c106b0..743513092e2 100644 --- a/mysql-test/r/win.result +++ b/mysql-test/r/win.result @@ -3174,6 +3174,18 @@ Nth_value(i,1) OVER() 1 DROP TABLE t1; # +# A regression after MDEV-13351: +# MDEV-13374 : Server crashes in first_linear_tab / st_select_lex::set_explain_type +# upon UNION with aggregate function +# +CREATE TABLE t1 (i INT) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1),(2); +SELECT i AS fld FROM t1 UNION SELECT COUNT(*) AS fld FROM t1; +fld +1 +2 +DROP TABLE t1; +# # Start of 10.3 tests # # |