summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2006-06-15 01:48:41 +0400
committerunknown <evgen@moonbone.local>2006-06-15 01:48:41 +0400
commitb2f308160b761f98d5864b36b33b64d82273cdcf (patch)
tree8cc35e337f835b4b9ef71b7e4b6807e6df966c5a /mysql-test/r
parent9936533be9359176ae7f196ef3291c5ee0df2e97 (diff)
downloadmariadb-git-b2f308160b761f98d5864b36b33b64d82273cdcf.tar.gz
Many files:
After merge fix mysql-test/r/func_time.result: After merge fix mysql-test/r/func_concat.result: After merge fix mysql-test/r/cast.result: After merge fix sql/item_cmpfunc.h: After merge fix sql/item_cmpfunc.cc: After merge fix sql/field.cc: After merge fix
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/cast.result2
-rw-r--r--mysql-test/r/func_concat.result14
-rw-r--r--mysql-test/r/func_time.result4
3 files changed, 11 insertions, 9 deletions
diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result
index 8f5a5eea99f..d60efa083e0 100644
--- a/mysql-test/r/cast.result
+++ b/mysql-test/r/cast.result
@@ -254,7 +254,7 @@ cast("2001-1-1" as datetime) = "2001-01-01 00:00:00"
1
select cast("1:2:3" as TIME) = "1:02:03";
cast("1:2:3" as TIME) = "1:02:03"
-1
+0
select cast(NULL as DATE);
cast(NULL as DATE)
NULL
diff --git a/mysql-test/r/func_concat.result b/mysql-test/r/func_concat.result
index 7fb489f2a14..66808afd4e9 100644
--- a/mysql-test/r/func_concat.result
+++ b/mysql-test/r/func_concat.result
@@ -68,13 +68,6 @@ select 'a' union select concat('a', -0.0000);
a
a
a0.0000
-create table t1(f1 varchar(6)) charset=utf8;
-insert into t1 values ("123456");
-select concat(f1, 2) a from t1 union select 'x' a from t1;
-a
-1234562
-x
-drop table t1;
select concat((select x from (select 'a' as x) as t1 ),
(select y from (select 'b' as y) as t2 )) from (select 1 union select 2 )
as t3;
@@ -82,3 +75,10 @@ concat((select x from (select 'a' as x) as t1 ),
(select y from (select 'b' as y) as t2 ))
ab
ab
+create table t1(f1 varchar(6)) charset=utf8;
+insert into t1 values ("123456");
+select concat(f1, 2) a from t1 union select 'x' a from t1;
+a
+1234562
+x
+drop table t1;
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index a0faa05f988..cee5dc70c32 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -784,7 +784,9 @@ f1
select f1 from t1 where "2006-1-1" between f1 and 'zzz';
f1
Warnings:
-Warning 1292 Truncated incorrect date value: 'zzz'
+Warning 1292 Incorrect date value: 'zzz' for column 'f1' at row 1
+Warning 1292 Truncated incorrect INTEGER value: 'zzz'
+Warning 1292 Truncated incorrect INTEGER value: 'zzz'
select f1 from t1 where makedate(2006,1) between date(f1) and date(f3);
f1
2006-01-01