summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <kroki/tomash@moonlight.intranet>2006-11-16 14:49:41 +0300
committerunknown <kroki/tomash@moonlight.intranet>2006-11-16 14:49:41 +0300
commit9d4d6ffed30f593323d40cf316a8ec4cd3784b85 (patch)
tree98dd225dfa26c9a69bb945a7f613faefbd6a0b43 /mysql-test/t
parent5cb0011de73419db7ea8c736030c4add83e94620 (diff)
downloadmariadb-git-9d4d6ffed30f593323d40cf316a8ec4cd3784b85.tar.gz
Fix after manual merge.
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/func_str.test31
1 files changed, 14 insertions, 17 deletions
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test
index 4a9a6d3e1c6..83a2c0a9029 100644
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
@@ -782,22 +782,6 @@ DROP TABLE t1,t2;
#
-# BUG#17047: CHAR() and IN() can return NULL without signaling NULL
-# result
-#
-SET @orig_sql_mode = @@SQL_MODE;
-SET SQL_MODE=traditional;
-
-SELECT CHAR(0xff,0x8f USING utf8);
-SELECT CHAR(0xff,0x8f USING utf8) IS NULL;
-
-SET SQL_MODE=@orig_sql_mode;
-
-
---echo End of 5.0 tests
-
-
-#
# Bug #10963
# 4294967296 18446744073709551616
@@ -987,4 +971,17 @@ select lpad('hello', -18446744073709551617, '1');
select lpad('hello', 18446744073709551617, '1');
---echo End of 5.1 tests
+#
+# BUG#17047: CHAR() and IN() can return NULL without signaling NULL
+# result
+#
+SET @orig_sql_mode = @@SQL_MODE;
+SET SQL_MODE=traditional;
+
+SELECT CHAR(0xff,0x8f USING utf8);
+SELECT CHAR(0xff,0x8f USING utf8) IS NULL;
+
+SET SQL_MODE=@orig_sql_mode;
+
+
+--echo End of 5.0 tests