bk commit into 5.1 tree (msvensson:1.2492)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-16 12:50:24+02:00, msvensson@stripped +38 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2904.5

  include/my_time.h@stripped, 2007-05-16 12:49:36+02:00, msvensson@stripped +0 -1
    Auto merged
    MERGE: 1.11.8.1

  mysql-test/r/date_formats.result@stripped, 2007-05-16 12:49:36+02:00,
msvensson@stripped +0 -16
    Auto merged
    MERGE: 1.18.12.1

  mysql-test/r/func_sapdb.result@stripped, 2007-05-16 12:49:36+02:00, msvensson@stripped
+0 -6
    Auto merged
    MERGE: 1.15.7.1

  mysql-test/r/ps_2myisam.result@stripped, 2007-05-16 12:49:36+02:00, msvensson@stripped
+0 -7
    Auto merged
    MERGE: 1.39.6.1

  mysql-test/r/ps_3innodb.result@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped
+0 -7
    Auto merged
    MERGE: 1.42.6.1

  mysql-test/r/ps_4heap.result@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped
+0 -7
    Auto merged
    MERGE: 1.38.6.1

  mysql-test/r/ps_5merge.result@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped
+0 -14
    Auto merged
    MERGE: 1.39.6.1

  mysql-test/r/ps_7ndb.result@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0
-7
    Auto merged
    MERGE: 1.26.8.1

  mysql-test/r/strict.result@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0
-2
    Auto merged
    MERGE: 1.25.8.1

  mysql-test/r/type_date.result@stripped, 2007-05-16 12:49:43+02:00, msvensson@stripped
+0 -26
    Use local
    MERGE: 1.13.4.1

  mysql-test/r/type_datetime.result@stripped, 2007-05-16 12:49:37+02:00,
msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.30.4.1

  mysql-test/t/date_formats.test@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped
+0 -2
    Auto merged
    MERGE: 1.14.7.1

  mysql-test/t/func_sapdb.test@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped
+0 -2
    Auto merged
    MERGE: 1.13.3.1

  mysql-test/t/type_date.test@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0
-13
    Auto merged
    MERGE: 1.14.3.1

  mysql-test/t/type_datetime.test@stripped, 2007-05-16 12:49:37+02:00,
msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.18.4.1

  sql-common/my_time.c@stripped, 2007-05-16 12:49:38+02:00, msvensson@stripped +0 -33
    Auto merged
    MERGE: 1.19.17.1

  sql/field.cc@stripped, 2007-05-16 12:49:46+02:00, msvensson@stripped +0 -75
    Use local
    MERGE: 1.256.51.1

  sql/field.h@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0 -15
    Auto merged
    MERGE: 1.153.27.1

  sql/item.cc@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0 -46
    Auto merged
    MERGE: 1.113.85.1

  sql/item.h@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0 -13
    Auto merged
    MERGE: 1.183.33.1

  sql/item_cmpfunc.cc@stripped, 2007-05-16 12:49:50+02:00, msvensson@stripped +0 -6
    Use local
    ul
    MERGE: 1.187.37.1

  sql/item_func.h@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0 -2
    Auto merged
    MERGE: 1.136.27.1

  sql/item_timefunc.cc@stripped, 2007-05-16 12:49:58+02:00, msvensson@stripped +0 -124
    Use local
    MERGE: 1.100.31.1

  sql/item_timefunc.h@stripped, 2007-05-16 12:50:02+02:00, msvensson@stripped +0 -24
    Use local
    MERGE: 1.63.5.1

  sql/my_decimal.cc@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0 -1
    Auto merged
    MERGE: 1.11.3.1

  sql/my_decimal.h@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0 -1
    Auto merged
    MERGE: 1.10.3.1

  sql/mysql_priv.h@stripped, 2007-05-16 12:50:07+02:00, msvensson@stripped +0 -19
    Use local
    MERGE: 1.290.111.1

  sql/protocol.cc@stripped, 2007-05-16 12:50:11+02:00, msvensson@stripped +0 -6
    Use local
    MERGE: 1.111.6.1

  sql/protocol.h@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0 -9
    Auto merged
    MERGE: 1.31.4.1

  sql/sp.cc@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0 -1
    Auto merged
    MERGE: 1.82.28.1

  sql/sql_base.cc@stripped, 2007-05-16 12:49:37+02:00, msvensson@stripped +0 -1
    Auto merged
    MERGE: 1.235.97.1

  sql/sql_class.h@stripped, 2007-05-16 12:49:38+02:00, msvensson@stripped +0 -1
    Auto merged
    MERGE: 1.230.64.1

  sql/sql_show.cc@stripped, 2007-05-16 12:49:38+02:00, msvensson@stripped +0 -2
    Auto merged
    MERGE: 1.253.52.1

  sql/structs.h@stripped, 2007-05-16 12:49:38+02:00, msvensson@stripped +0 -1
    Auto merged
    MERGE: 1.53.3.1

  sql/time.cc@stripped, 2007-05-16 12:50:16+02:00, msvensson@stripped +0 -20
    Use local
    MERGE: 1.57.8.1

  sql/tztime.cc@stripped, 2007-05-16 12:49:38+02:00, msvensson@stripped +0 -44
    Auto merged
    MERGE: 1.24.5.1

  sql/tztime.h@stripped, 2007-05-16 12:49:38+02:00, msvensson@stripped +0 -5
    Auto merged
    MERGE: 1.12.3.1

  sql/unireg.cc@stripped, 2007-05-16 12:49:38+02:00, msvensson@stripped +0 -3
    Auto merged
    MERGE: 1.53.11.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.45/mysql-test/r/type_datetime.result	2007-05-14 14:21:48 +02:00
+++ 1.46/mysql-test/r/type_datetime.result	2007-05-16 12:49:37 +02:00
@@ -192,6 +192,41 @@ CAST(CAST('2006-08-10 10:11:12' AS DATET
 SELECT CAST(CAST('10:11:12.098700' AS TIME) AS DECIMAL(20,6));
 CAST(CAST('10:11:12.098700' AS TIME) AS DECIMAL(20,6))
 101112.098700
+set @org_mode=@@sql_mode;
+create table t1 (da date default '1962-03-03 23:33:34', dt datetime default
'1962-03-03');
+Warnings:
+Note	1265	Data truncated for column 'da' at row 1
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `da` date default '1962-03-03',
+  `dt` datetime default '1962-03-03 00:00:00'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+insert into t1 values ();
+insert into t1 values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
+Warnings:
+Note	1265	Data truncated for column 'da' at row 1
+set @@sql_mode='ansi,traditional';
+insert into t1 values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
+Warnings:
+Note	1265	Data truncated for column 'da' at row 1
+insert into t1 set dt='2007-03-23 13:49:38',da=dt;
+Warnings:
+Note	1265	Data truncated for column 'da' at row 1
+insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
+ERROR 22007: Incorrect date value: '2007-03-32' for column 'da' at row 1
+select * from t1;
+da	dt
[phone]-03 00:00:00
[phone]-23 13:49:38
[phone]-23 13:49:38
[phone]-23 13:49:38
+drop table t1;
+create table t1 (da date default '1962-03-32 23:33:34', dt datetime default
'1962-03-03');
+ERROR 42000: Invalid default value for 'da'
+create table t1 (t time default '916:00:00 a');
+ERROR 42000: Invalid default value for 't'
+set @@sql_mode= @org_mode;
 create table t1 (f1 date, f2 datetime, f3 timestamp);
 insert into t1(f1) values(curdate());
 select curdate() < now(), f1 < now(), cast(f1 as date) < now() from t1;

--- 1.27/mysql-test/t/type_datetime.test	2007-05-14 14:21:49 +02:00
+++ 1.28/mysql-test/t/type_datetime.test	2007-05-16 12:49:37 +02:00
@@ -141,6 +141,31 @@ SELECT CAST(CAST('2006-08-10 10:11:12' A
 SELECT CAST(CAST('2006-08-10 10:11:12' AS DATETIME) + INTERVAL 14 MICROSECOND AS
DECIMAL(20,6));
 SELECT CAST(CAST('10:11:12.098700' AS TIME) AS DECIMAL(20,6));
 
+
+#
+# Test of storing datetime into date fields
+#
+
+set @org_mode=@@sql_mode;
+create table t1 (da date default '1962-03-03 23:33:34', dt datetime default
'1962-03-03');
+show create table t1;
+insert into t1 values ();
+insert into t1 values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
+set @@sql_mode='ansi,traditional';
+insert into t1 values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
+insert into t1 set dt='2007-03-23 13:49:38',da=dt;
+# Test error handling
+--error 1292
+insert into t1 values ('2007-03-32','2007-03-23 13:49:38');
+select * from t1;
+drop table t1;
+--error 1067
+create table t1 (da date default '1962-03-32 23:33:34', dt datetime default
'1962-03-03');
+--error 1067
+create table t1 (t time default '916:00:00 a');
+set @@sql_mode= @org_mode;
+
+
 #
 # Bug#27590: Wrong DATE/DATETIME comparison.  
 #