summaryrefslogtreecommitdiff
path: root/mysql-test/main/order_by.test
diff options
context:
space:
mode:
authorVarun Gupta <varun.gupta@mariadb.com>2020-02-11 17:16:37 +0530
committerVarun Gupta <varun.gupta@mariadb.com>2020-02-12 20:16:23 +0530
commitf0606a7530a74579e73e9043c4204f830b5a168a (patch)
tree71cc9ea829be723a54f4f65a151ddc491182f75b /mysql-test/main/order_by.test
parent1a6f708ec594ac0ae2dd30db926ab07b100fa24b (diff)
downloadmariadb-git-f0606a7530a74579e73e9043c4204f830b5a168a.tar.gz
MDEV-21665: Server crashes in my_qsort2 / Filesort_buffer::sort_buffer
Allocation should use ALIGN_SIZE when we need to make sure that we have atleast enough space to store one record in MERGEBUFF2 buffers
Diffstat (limited to 'mysql-test/main/order_by.test')
-rw-r--r--mysql-test/main/order_by.test21
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/main/order_by.test b/mysql-test/main/order_by.test
index 19129c418b3..c283b805bee 100644
--- a/mysql-test/main/order_by.test
+++ b/mysql-test/main/order_by.test
@@ -2292,3 +2292,24 @@ set histogram_size=@tmp_h, histogram_type=@tmp_ht, use_stat_tables=@tmp_u,
optimizer_use_condition_selectivity=@tmp_o;
drop table t1,t2,t3,t4;
+
+--echo #
+--echo # MDEV-21655: Server crashes in my_qsort2 / Filesort_buffer::sort_buffer
+--echo #
+
+set @save_sql_mode= @@sql_mode;
+set sql_mode= 'PAD_CHAR_TO_FULL_LENGTH';
+CREATE TABLE t1 ( a CHAR(255) charset utf8,
+ b CHAR(255) charset utf8, c TEXT);
+INSERT INTO t1 VALUES
+('1','a', 'a'), ('2','b', 'b'), ('3','c', 'c'), ('4','d','d'),
+('5','e', 'e'), ('6','f', 'f'), ('7','g','g'), ('8','h','h'),
+('9','i', 'i'), ('10','j','j'), ('11','k','k'), ('12','l','l'),
+('13','m','m'), ('14','n','n'), ('15','o','o');
+
+set sort_buffer_size=517*30;
+select c from t1 order by a,b;
+
+set sql_mode= @save_sql_mode;
+
+drop table t1;