summaryrefslogtreecommitdiff
path: root/mysql-test/t/func_str.test
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@hfmain.(none)>2007-11-05 18:27:17 +0400
committerunknown <holyfoot/hf@hfmain.(none)>2007-11-05 18:27:17 +0400
commitc98b7fe5b7bc274acf5f4e71241e0035a21d19c0 (patch)
treea8b54c7bae40f9800e33bf1d3d9b3452f9af87e1 /mysql-test/t/func_str.test
parentf97b8e48b8f6ec290f7cc7ca3fe59c33f7cb0d9e (diff)
parent462a6f7d1a88297df119cbf5a055716288c2fa6a (diff)
downloadmariadb-git-c98b7fe5b7bc274acf5f4e71241e0035a21d19c0.tar.gz
Merge mysql.com:/home/hf/work/31758/my50-31758
into mysql.com:/home/hf/work/31758/my51-31758 mysql-test/t/func_str.test: Auto merged sql/item_strfunc.h: Auto merged mysql-test/r/func_str.result: merging
Diffstat (limited to 'mysql-test/t/func_str.test')
-rw-r--r--mysql-test/t/func_str.test13
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test
index 0ba0ba30cd2..b6da14211ae 100644
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
@@ -782,6 +782,19 @@ explain extended select encode(f1,'zxcv') as 'enc' from t1;
explain extended select decode(f1,'zxcv') as 'enc' from t1;
drop table t1;
+#
+# Bug #31758 inet_ntoa, oct, crashes server with null + filesort
+#
+create table t1 (a bigint not null)engine=myisam;
+insert into t1 set a = 1024*1024*1024*4;
+delete from t1 order by (inet_ntoa(a)) desc limit 10;
+drop table t1;
+create table t1 (a char(36) not null)engine=myisam;
+insert ignore into t1 set a = ' ';
+insert ignore into t1 set a = ' ';
+select * from t1 order by (oct(a));
+drop table t1;
+
--echo End of 4.1 tests
#