Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1

sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/procedure.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

2 files changed, 4 insertions, 4 deletions

diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result
index ec37c9a5763..18241a8fcc1 100644
--- a/mysql-test/r/case.result
+++ b/mysql-test/r/case.result
@@ -10,10 +10,10 @@ CASE "c" when "a" then 1 when "b" then 2 ELSE 3 END
 3
 select CASE BINARY "b" when "a" then 1 when "B" then 2 WHEN "b" then "ok" END;
 CASE BINARY "b" when "a" then 1 when "B" then 2 WHEN "b" then "ok" END
-ok
+0
 select CASE "b" when "a" then 1 when binary "B" then 2 WHEN "b" then "ok" END;
 CASE "b" when "a" then 1 when binary "B" then 2 WHEN "b" then "ok" END
-ok
+0
 select CASE concat("a","b") when concat("ab","") then "a" when "b" then "b" end;
 CASE concat("a","b") when concat("ab","") then "a" when "b" then "b" end
 a
diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result
index 572b32c171c..2309de2354b 100644
--- a/mysql-test/r/cast.result
+++ b/mysql-test/r/cast.result
@@ -24,10 +24,10 @@ cast("A" as binary) = "a"	cast(BINARY "a" as CHAR) = "A"
 0	1
 select cast("2001-1-1" as DATE), cast("2001-1-1" as DATETIME);
 cast("2001-1-1" as DATE)	cast("2001-1-1" as DATETIME)
-2001-1-1	2001-1-1
+2001-01-01	2001-01-01 00:00:00
 select cast("1:2:3" as TIME);
 cast("1:2:3" as TIME)
-1:2:3
+1:02:03
 select cast("2001-1-1" as date) = "2001-01-01";
 cast("2001-1-1" as date) = "2001-01-01"
 0