diff options
author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-05 18:12:42 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-05 18:12:42 +0400 |
commit | 62617b09c3ffd2fbd512f6a038dfa20a37df4c3b (patch) | |
tree | ae24652ad56bfe7d209902f423129f66134466e8 /mysql-test/t/func_str.test | |
parent | 9e6bb07d3845566ffa7274bb14df544c8147f594 (diff) | |
parent | e722393f519400c2f14999cbc669cafea648aa9e (diff) | |
download | mariadb-git-62617b09c3ffd2fbd512f6a038dfa20a37df4c3b.tar.gz |
Merge mysql.com:/home/hf/work/31758/my41-31758
into mysql.com:/home/hf/work/31758/my50-31758
mysql-test/t/func_str.test:
Auto merged
mysql-test/r/func_str.result:
merging
sql/item_strfunc.h:
merging
Diffstat (limited to 'mysql-test/t/func_str.test')
-rw-r--r-- | mysql-test/t/func_str.test | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index e04276fa305..1ca2bbfaf4c 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -738,6 +738,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 # |