diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-04 17:46:28 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-04 17:46:28 +0100 |
| commit | 008ee867a4cc80e079bd2a8b7f8c8543d80c31f1 (patch) | |
| tree | 9a971dca67c9edeabeb655b2275aea4b76729333 /mysql-test/main | |
| parent | 670c9a3a182cfc3a75bc8ed847cadb2931aaaec4 (diff) | |
| parent | c9b9eb331570704d020fcc7c7894f19febe7f26d (diff) | |
| download | mariadb-git-008ee867a4cc80e079bd2a8b7f8c8543d80c31f1.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/mysqld--help.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/order_by.result | 30 | ||||
| -rw-r--r-- | mysql-test/main/order_by.test | 16 |
3 files changed, 47 insertions, 1 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index 067348eeb45..6e4a109b1b6 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1717,5 +1717,5 @@ userstat FALSE verbose TRUE wait-timeout 28800 -To see what values a running MySQL server is using, type +To see what variables a running MySQL server is using, type 'mysqladmin variables' instead of 'mysqld --verbose --help'. diff --git a/mysql-test/main/order_by.result b/mysql-test/main/order_by.result index 8692e727c60..ec03e8c5f45 100644 --- a/mysql-test/main/order_by.result +++ b/mysql-test/main/order_by.result @@ -3206,6 +3206,36 @@ pk 3 DROP TABLE t1; # +# MDEV-21044: Wrong result when using a smaller size for sort buffer +# +create table t1(a varchar(765),b int); +insert into t1 values ("a",1),("b",2),("c",3),("e",4); +insert into t1 values ("d",5),("f",6),("g",7),("h",8); +insert into t1 values ("k",11),("l",12),("i",9),("j",10); +insert into t1 values ("m",13),("n",14),("o",15),("p",16); +set @save_sort_buffer_size= @@sort_buffer_size; +set sort_buffer_size=1024; +select * from t1 order by b; +a b +a 1 +b 2 +c 3 +e 4 +d 5 +f 6 +g 7 +h 8 +i 9 +j 10 +k 11 +l 12 +m 13 +n 14 +o 15 +p 16 +set @@sort_buffer_size= @save_sort_buffer_size; +drop table t1; +# # MDEV-13994: Bad join results with orderby_uses_equalities=on # CREATE TABLE books ( diff --git a/mysql-test/main/order_by.test b/mysql-test/main/order_by.test index 58b91fbda91..bcb9039ec88 100644 --- a/mysql-test/main/order_by.test +++ b/mysql-test/main/order_by.test @@ -2146,6 +2146,22 @@ SELECT DISTINCT pk FROM t1; DROP TABLE t1; --echo # +--echo # MDEV-21044: Wrong result when using a smaller size for sort buffer +--echo # + +create table t1(a varchar(765),b int); +insert into t1 values ("a",1),("b",2),("c",3),("e",4); +insert into t1 values ("d",5),("f",6),("g",7),("h",8); +insert into t1 values ("k",11),("l",12),("i",9),("j",10); +insert into t1 values ("m",13),("n",14),("o",15),("p",16); +set @save_sort_buffer_size= @@sort_buffer_size; +set sort_buffer_size=1024; +select * from t1 order by b; +set @@sort_buffer_size= @save_sort_buffer_size; +drop table t1; + + +--echo # --echo # MDEV-13994: Bad join results with orderby_uses_equalities=on --echo # |