List:Commits« Previous MessageNext Message »
From:Alexander Barkov Date:November 2 2011 6:14am
Subject:bzr push into mysql-trunk branch (alexander.barkov:3544 to 3545) WL#946
View as plain text  
 3545 Alexander Barkov	2011-11-02
      WL#946 test clean-up

    modified:
      mysql-test/r/type_temporal_fractional.result
      mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      mysql-test/suite/parts/r/partition_datetime_innodb.result
      mysql-test/suite/parts/r/partition_datetime_myisam.result
      mysql-test/t/type_temporal_fractional.test
      sql/item_cmpfunc.cc
      sql/log_event.cc
 3544 Alexander Barkov	2011-11-02
      WL#946 clean-ups

    modified:
      mysql-test/r/mysqlbinlog_row.result
      mysql-test/r/mysqlbinlog_row_innodb.result
      mysql-test/r/mysqlbinlog_row_myisam.result
      sql/sys_vars.cc
      sql/sys_vars.h
=== modified file 'mysql-test/r/type_temporal_fractional.result'
--- a/mysql-test/r/type_temporal_fractional.result	2011-11-01 11:52:24 +0000
+++ b/mysql-test/r/type_temporal_fractional.result	2011-11-02 06:13:46 +0000
@@ -15923,12 +15923,6 @@ WHERE col_time_not_null_key <= col_times
 AND col_time_2_key > SUBTIME('2006-07-16', '05:05:02.040778')
 ORDER BY col_datetime_5_not_null_key, col_time_1;
 c1
-Warnings:
-Warning	1292	Truncated incorrect time value: '2006-07-16'
-Warning	1292	Truncated incorrect time value: '2006-07-16'
-Warning	1292	Truncated incorrect time value: '2006-07-16'
-Warning	1292	Truncated incorrect time value: '2006-07-16'
-Warning	1292	Truncated incorrect time value: '2006-07-16'
 DROP TABLE t1;
 CREATE TABLE t1 (
 col_timestamp_3_not_null_key timestamp(3) NULL DEFAULT '0000-00-00 00:00:00.000',

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_is_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result	2011-07-19 15:11:15 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result	2011-11-02 06:13:46 +0000
@@ -25,7 +25,7 @@ def	information_schema	COLUMNS	COLUMN_KE
 def	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	COLUMNS	COLUMN_TYPE	15	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext				
 def	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
-def	information_schema	COLUMNS	EXTRA	17		NO	varchar	27	81	NULL	NULL	utf8	utf8_general_ci	varchar(27)				
+def	information_schema	COLUMNS	EXTRA	17		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)				
 def	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)				
 def	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(21) unsigned				
 def	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(21) unsigned				
@@ -424,7 +424,7 @@ NULL	information_schema	COLUMNS	NUMERIC_
 3.0000	information_schema	COLUMNS	COLLATION_NAME	varchar	32	96	utf8	utf8_general_ci	varchar(32)
 1.0000	information_schema	COLUMNS	COLUMN_TYPE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	COLUMNS	COLUMN_KEY	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	COLUMNS	EXTRA	varchar	27	81	utf8	utf8_general_ci	varchar(27)
+3.0000	information_schema	COLUMNS	EXTRA	varchar	30	90	utf8	utf8_general_ci	varchar(30)
 3.0000	information_schema	COLUMNS	PRIVILEGES	varchar	80	240	utf8	utf8_general_ci	varchar(80)
 3.0000	information_schema	COLUMNS	COLUMN_COMMENT	varchar	1024	3072	utf8	utf8_general_ci	varchar(1024)
 3.0000	information_schema	COLUMN_PRIVILEGES	GRANTEE	varchar	81	243	utf8	utf8_general_ci	varchar(81)

=== modified file 'mysql-test/suite/opt_trace/r/subquery_ps_prot.result'
--- a/mysql-test/suite/opt_trace/r/subquery_ps_prot.result	2011-10-27 08:52:27 +0000
+++ b/mysql-test/suite/opt_trace/r/subquery_ps_prot.result	2011-11-02 06:13:46 +0000
@@ -1061,12 +1061,12 @@ field4,field5,field6	{
                           {
                             "access_type": "scan",
                             "rows": 3,
-                            "cost": 2.0371,
+                            "cost": 2.0342,
                             "chosen": true
                           }
                         ] /* considered_access_paths */
                       } /* best_access_path */,
-                      "cost_for_plan": 2.6371,
+                      "cost_for_plan": 2.6342,
                       "rows_for_plan": 3,
                       "chosen": true
                     }
@@ -1216,7 +1216,7 @@ field4,field5,field6	{
                 "range_analysis": {
                   "table_scan": {
                     "rows": 3,
-                    "cost": 4.7371
+                    "cost": 4.7342
                   } /* table_scan */,
                   "potential_range_indices": [
                     {
@@ -1289,12 +1289,12 @@ field4,field5,field6	{
                     {
                       "access_type": "scan",
                       "rows": 3,
-                      "cost": 2.0371,
+                      "cost": 2.0342,
                       "chosen": true
                     }
                   ] /* considered_access_paths */
                 } /* best_access_path */,
-                "cost_for_plan": 2.6371,
+                "cost_for_plan": 2.6342,
                 "rows_for_plan": 3,
                 "rest_of_plan": [
                   {
@@ -1325,7 +1325,7 @@ field4,field5,field6	{
                         }
                       ] /* considered_access_paths */
                     } /* best_access_path */,
-                    "cost_for_plan": 3.7171,
+                    "cost_for_plan": 3.7142,
                     "rows_for_plan": 0.9,
                     "chosen": true
                   }
@@ -1371,12 +1371,12 @@ field4,field5,field6	{
                           "access_type": "scan",
                           "using_join_cache": true,
                           "rows": 3,
-                          "cost": 2.0373,
+                          "cost": 2.0344,
                           "chosen": true
                         }
                       ] /* considered_access_paths */
                     } /* best_access_path */,
-                    "cost_for_plan": 2.5773,
+                    "cost_for_plan": 2.5744,
                     "rows_for_plan": 0.9,
                     "chosen": true
                   }
@@ -1543,12 +1543,12 @@ field4,field5,field6	{
                                           {
                                             "access_type": "scan",
                                             "rows": 3,
-                                            "cost": 2.0371,
+                                            "cost": 2.0342,
                                             "chosen": true
                                           }
                                         ] /* considered_access_paths */
                                       } /* best_access_path */,
-                                      "cost_for_plan": 2.6371,
+                                      "cost_for_plan": 2.6342,
                                       "rows_for_plan": 3,
                                       "rest_of_plan": [
                                         {
@@ -1560,12 +1560,12 @@ field4,field5,field6	{
                                                 "access_type": "scan",
                                                 "using_join_cache": true,
                                                 "rows": 3,
-                                                "cost": 2.0374,
+                                                "cost": 2.0345,
                                                 "chosen": true
                                               }
                                             ] /* considered_access_paths */
                                           } /* best_access_path */,
-                                          "cost_for_plan": 6.4745,
+                                          "cost_for_plan": 6.4686,
                                           "rows_for_plan": 9,
                                           "chosen": true
                                         }
@@ -1579,12 +1579,12 @@ field4,field5,field6	{
                                           {
                                             "access_type": "scan",
                                             "rows": 3,
-                                            "cost": 2.0371,
+                                            "cost": 2.0342,
                                             "chosen": true
                                           }
                                         ] /* considered_access_paths */
                                       } /* best_access_path */,
-                                      "cost_for_plan": 2.6371,
+                                      "cost_for_plan": 2.6342,
                                       "rows_for_plan": 3,
                                       "rest_of_plan": [
                                         {
@@ -1603,12 +1603,12 @@ field4,field5,field6	{
                                                 "access_type": "scan",
                                                 "using_join_cache": true,
                                                 "rows": 3,
-                                                "cost": 2.0373,
+                                                "cost": 2.0344,
                                                 "chosen": true
                                               }
                                             ] /* considered_access_paths */
                                           } /* best_access_path */,
-                                          "cost_for_plan": 6.4745,
+                                          "cost_for_plan": 6.4686,
                                           "rows_for_plan": 9,
                                           "pruned_by_cost": true
                                         }
@@ -1909,7 +1909,7 @@ table2.`col_int_nokey` <> any ( select 5
                 "range_analysis": {
                   "table_scan": {
                     "rows": 2,
-                    "cost": 4.5244
+                    "cost": 4.5225
                   } /* table_scan */,
                   "potential_range_indices": [
                     {
@@ -2017,7 +2017,7 @@ table2.`col_int_nokey` <> any ( select 5
                           "access_type": "scan",
                           "using_join_cache": true,
                           "rows": 2,
-                          "cost": 2.0247,
+                          "cost": 2.0227,
                           "chosen": false
                         }
                       ] /* considered_access_paths */
@@ -2099,12 +2099,12 @@ table2.`col_int_nokey` <> any ( select 5
                                           {
                                             "access_type": "scan",
                                             "rows": 2,
-                                            "cost": 2.0244,
+                                            "cost": 2.0225,
                                             "chosen": true
                                           }
                                         ] /* considered_access_paths */
                                       } /* best_access_path */,
-                                      "cost_for_plan": 2.4244,
+                                      "cost_for_plan": 2.4225,
                                       "rows_for_plan": 2,
                                       "chosen": true
                                     }

=== modified file 'mysql-test/suite/parts/r/partition_datetime_innodb.result'
--- a/mysql-test/suite/parts/r/partition_datetime_innodb.result	2011-03-24 13:10:37 +0000
+++ b/mysql-test/suite/parts/r/partition_datetime_innodb.result	2011-11-02 06:13:46 +0000
@@ -19,9 +19,9 @@ insert into t1 values ('1975-01-01 21:21
 select * from t1;
 a
 2000-06-15 23:59:00
-1980-10-14 03:03:00
-1975-01-01 21:21:21
 2020-12-31 12:10:30
+1975-01-01 21:21:21
+1980-10-14 03:03:00
 select * from t1 where a=19801014030300;
 a
 1980-10-14 03:03:00
@@ -29,8 +29,8 @@ delete from t1 where a=19801014030300;
 select * from t1;
 a
 2000-06-15 23:59:00
-1975-01-01 21:21:21
 2020-12-31 12:10:30
+1975-01-01 21:21:21
 drop table t1;
 create table t2 (a timestamp not null, primary key(a)) engine='InnoDB' 
 partition by key (a) partitions 12;
@@ -124,64 +124,64 @@ count(*)
 59
 select * from t2;
 a
-1971-01-01 00:00:01
-1971-01-01 00:00:04
-1971-01-01 00:00:06
 1971-01-01 00:00:14
-1971-01-01 00:00:16
-1971-01-01 00:00:17
-1971-01-01 00:00:18
-1971-01-01 00:00:22
-1971-01-01 00:00:23
-1971-01-01 00:00:26
-1971-01-01 00:00:27
+1971-01-01 00:00:34
+1971-01-01 00:00:42
+1971-01-01 00:00:58
+1971-01-01 00:00:21
 1971-01-01 00:00:29
-1971-01-01 00:00:30
-1971-01-01 00:00:33
+1971-01-01 00:00:37
+1971-01-01 00:00:53
+1971-01-01 00:00:57
+1971-01-01 00:00:04
+1971-01-01 00:00:08
+1971-01-01 00:00:20
 1971-01-01 00:00:36
-1971-01-01 00:00:38
 1971-01-01 00:00:44
-1971-01-01 00:00:46
-1971-01-01 00:00:53
-1971-01-01 00:00:07
-1971-01-01 00:00:09
+1971-01-01 00:00:11
+1971-01-01 00:00:23
+1971-01-01 00:00:27
+1971-01-01 00:00:31
+1971-01-01 00:00:02
+1971-01-01 00:00:06
 1971-01-01 00:00:10
+1971-01-01 00:00:22
+1971-01-01 00:00:38
+1971-01-01 00:00:50
+1971-01-01 00:00:17
+1971-01-01 00:00:33
+1971-01-01 00:00:45
 1971-01-01 00:00:12
-1971-01-01 00:00:15
+1971-01-01 00:00:52
+1971-01-01 00:00:56
+1971-01-01 00:00:07
 1971-01-01 00:00:19
-1971-01-01 00:00:24
-1971-01-01 00:00:28
+1971-01-01 00:00:35
 1971-01-01 00:00:39
-1971-01-01 00:00:41
-1971-01-01 00:00:42
-1971-01-01 00:00:43
 1971-01-01 00:00:47
-1971-01-01 00:00:48
-1971-01-01 00:00:49
-1971-01-01 00:00:52
-1971-01-01 00:00:55
-1971-01-01 00:00:56
-1971-01-01 00:00:57
-1971-01-01 00:00:02
-1971-01-01 00:00:03
+1971-01-01 00:00:51
+1971-01-01 00:00:18
+1971-01-01 00:00:26
+1971-01-01 00:00:30
+1971-01-01 00:00:46
+1971-01-01 00:00:54
+1971-01-01 00:00:01
 1971-01-01 00:00:05
-1971-01-01 00:00:08
-1971-01-01 00:00:11
+1971-01-01 00:00:09
 1971-01-01 00:00:13
-1971-01-01 00:00:20
-1971-01-01 00:00:21
 1971-01-01 00:00:25
-1971-01-01 00:00:31
+1971-01-01 00:00:41
+1971-01-01 00:00:49
+1971-01-01 00:00:16
+1971-01-01 00:00:24
+1971-01-01 00:00:28
 1971-01-01 00:00:32
-1971-01-01 00:00:34
-1971-01-01 00:00:35
-1971-01-01 00:00:37
 1971-01-01 00:00:40
-1971-01-01 00:00:45
-1971-01-01 00:00:50
-1971-01-01 00:00:51
-1971-01-01 00:00:54
-1971-01-01 00:00:58
+1971-01-01 00:00:48
+1971-01-01 00:00:03
+1971-01-01 00:00:15
+1971-01-01 00:00:43
+1971-01-01 00:00:55
 1971-01-01 00:00:59
 drop table t2;
 create table t1 (a date not null, primary key(a)) engine='InnoDB' 
@@ -545,18 +545,18 @@ insert into t1 values ('21:21:21'), ('12
 select * from t1;
 a
 03:03:03
+21:21:21
 23:59:00
 12:10:30
-21:21:21
 select * from t1 where a=030303;
 a
 03:03:03
 delete from t1 where a=030303;
 select * from t1;
 a
+21:21:21
 23:59:00
 12:10:30
-21:21:21
 drop table t1;
 create table t2 (a time not null, primary key(a)) engine='InnoDB' 
 partition by key (a) partitions 12;
@@ -571,19 +571,19 @@ PARTITIONS 12 */
 insert into t2 values ('0:1:1'), ('10:11:12'), ('13:14:15'), ('14:15:16');
 select * from t2;
 a
-00:01:01
+10:11:12
 13:14:15
 14:15:16
-10:11:12
+00:01:01
 select * from t2 where a='13:14:15';
 a
 13:14:15
 delete from t2 where a='13:14:15';
 select * from t2;
 a
-00:01:01
-14:15:16
 10:11:12
+14:15:16
+00:01:01
 delete from t2;
 59 inserts;
 insert into t2 values (000100+59);
@@ -650,65 +650,65 @@ count(*)
 59
 select * from t2;
 a
-00:01:01
-00:01:13
-00:01:29
-00:01:41
-00:01:53
-00:01:04
-00:01:16
-00:01:32
-00:01:44
-00:01:56
-00:01:03
 00:01:15
-00:01:31
-00:01:43
-00:01:55
-00:01:06
-00:01:18
-00:01:34
-00:01:46
-00:01:58
-00:01:05
-00:01:17
-00:01:33
-00:01:45
-00:01:57
-00:01:08
-00:01:20
-00:01:24
-00:01:36
-00:01:48
-00:01:07
-00:01:19
 00:01:23
-00:01:35
+00:01:39
 00:01:47
 00:01:59
-00:01:10
-00:01:22
-00:01:26
-00:01:38
-00:01:50
-00:01:09
+00:01:16
+00:01:24
+00:01:40
+00:01:48
+00:01:05
+00:01:13
 00:01:21
-00:01:25
 00:01:37
-00:01:49
-00:01:12
-00:01:28
-00:01:40
-00:01:52
+00:01:45
+00:01:57
+00:01:14
+00:01:22
+00:01:38
+00:01:46
+00:01:58
+00:01:03
 00:01:11
-00:01:27
-00:01:39
-00:01:51
+00:01:19
+00:01:35
+00:01:43
+00:01:55
+00:01:04
+00:01:12
+00:01:20
+00:01:36
+00:01:44
+00:01:56
+00:01:01
+00:01:09
+00:01:29
+00:01:33
+00:01:41
+00:01:53
 00:01:02
-00:01:14
-00:01:30
+00:01:10
+00:01:18
+00:01:34
 00:01:42
 00:01:54
+00:01:07
+00:01:27
+00:01:31
+00:01:51
+00:01:08
+00:01:28
+00:01:32
+00:01:52
+00:01:17
+00:01:25
+00:01:49
+00:01:06
+00:01:26
+00:01:30
+00:01:50
 drop table t2;
 create table t3 (a time not null, primary key(a)) engine='InnoDB' 
 partition by range (second(a)) subpartition by key (a)
@@ -796,65 +796,65 @@ count(*)
 59
 select * from t3;
 a
-10:00:02
-10:00:05
 10:00:01
+10:00:06
+10:00:07
+10:00:14
+10:00:15
+10:00:02
 10:00:03
-10:00:04
 10:00:08
 10:00:09
-10:00:14
-10:00:06
-10:00:07
+10:00:04
+10:00:05
 10:00:10
 10:00:11
 10:00:12
 10:00:13
-10:00:15
-10:00:16
-10:00:18
-10:00:19
-10:00:25
-10:00:30
 10:00:20
 10:00:21
-10:00:22
+10:00:26
 10:00:27
-10:00:29
+10:00:16
 10:00:17
+10:00:22
 10:00:23
-10:00:24
-10:00:26
 10:00:28
-10:00:39
-10:00:40
-10:00:41
-10:00:42
-10:00:43
-10:00:31
+10:00:29
+10:00:18
+10:00:19
+10:00:24
+10:00:25
+10:00:30
 10:00:32
 10:00:33
-10:00:34
 10:00:35
+10:00:40
+10:00:41
+10:00:34
 10:00:36
 10:00:37
+10:00:42
+10:00:43
+10:00:31
 10:00:38
+10:00:39
 10:00:44
 10:00:45
-10:00:54
 10:00:46
-10:00:47
+10:00:48
 10:00:49
+10:00:54
+10:00:55
 10:00:50
 10:00:51
+10:00:56
+10:00:57
+10:00:59
+10:00:47
 10:00:52
 10:00:53
-10:00:55
-10:00:57
 10:00:58
-10:00:59
-10:00:48
-10:00:56
 drop table t3;
 create table t4 (a time not null, primary key(a)) engine='InnoDB' 
 partition by list (second(a)) subpartition by key (a)
@@ -942,65 +942,65 @@ count(*)
 59
 select * from t4;
 a
-10:00:02
-10:00:05
 10:00:01
+10:00:06
+10:00:07
+10:00:14
+10:00:15
+10:00:02
 10:00:03
-10:00:04
 10:00:08
 10:00:09
-10:00:14
-10:00:06
-10:00:07
+10:00:04
+10:00:05
 10:00:10
 10:00:11
 10:00:12
 10:00:13
-10:00:15
-10:00:16
-10:00:18
-10:00:19
-10:00:25
-10:00:30
 10:00:20
 10:00:21
-10:00:22
+10:00:26
 10:00:27
-10:00:29
+10:00:16
 10:00:17
+10:00:22
 10:00:23
-10:00:24
-10:00:26
 10:00:28
-10:00:39
-10:00:40
-10:00:41
-10:00:42
-10:00:43
-10:00:31
+10:00:29
+10:00:18
+10:00:19
+10:00:24
+10:00:25
+10:00:30
 10:00:32
 10:00:33
-10:00:34
 10:00:35
+10:00:40
+10:00:41
+10:00:34
 10:00:36
 10:00:37
+10:00:42
+10:00:43
+10:00:31
 10:00:38
+10:00:39
 10:00:44
 10:00:45
-10:00:54
 10:00:46
-10:00:47
+10:00:48
 10:00:49
+10:00:54
+10:00:55
 10:00:50
 10:00:51
+10:00:56
+10:00:57
+10:00:59
+10:00:47
 10:00:52
 10:00:53
-10:00:55
-10:00:57
 10:00:58
-10:00:59
-10:00:48
-10:00:56
 drop table t4;
 create table t1 (a datetime not null, primary key(a)) engine='InnoDB' 
 partition by key (a) (
@@ -1022,9 +1022,9 @@ t1	CREATE TABLE `t1` (
 insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59');
 select * from t1;
 a
-2020-12-31 12:10:30
-2000-06-15 23:59:00
 1975-01-01 21:21:21
+2000-06-15 23:59:00
+2020-12-31 12:10:30
 1980-10-14 03:03:00
 select * from t1 where a=19801014030300;
 a
@@ -1032,9 +1032,9 @@ a
 delete from t1 where a=19801014030300;
 select * from t1;
 a
-2020-12-31 12:10:30
-2000-06-15 23:59:00
 1975-01-01 21:21:21
+2000-06-15 23:59:00
+2020-12-31 12:10:30
 drop table t1;
 create table t2 (a datetime not null, primary key(a)) engine='InnoDB' 
 partition by key (a) partitions 12;
@@ -1049,8 +1049,8 @@ PARTITIONS 12 */
 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16');
 select * from t2;
 a
-2000-06-15 14:15:16
 2020-12-31 10:11:12
+2000-06-15 14:15:16
 1980-10-14 13:14:15
 1975-01-01 00:01:01
 select * from t2 where a='1980-10-14 13:14:15';
@@ -1059,8 +1059,8 @@ a
 delete from t2 where a='1980-10-14 13:14:15';
 select * from t2;
 a
-2000-06-15 14:15:16
 2020-12-31 10:11:12
+2000-06-15 14:15:16
 1975-01-01 00:01:01
 delete from t2;
 59 inserts;
@@ -1128,65 +1128,65 @@ count(*)
 59
 select * from t2;
 a
-1970-01-01 00:00:01
-1970-01-01 00:00:04
 1970-01-01 00:00:09
-1970-01-01 00:00:14
-1970-01-01 00:00:20
-1970-01-01 00:00:21
-1970-01-01 00:00:22
-1970-01-01 00:00:26
-1970-01-01 00:00:31
-1970-01-01 00:00:33
-1970-01-01 00:00:36
-1970-01-01 00:00:41
-1970-01-01 00:00:46
-1970-01-01 00:00:52
-1970-01-01 00:00:53
-1970-01-01 00:00:54
-1970-01-01 00:00:58
-1970-01-01 00:00:59
-1970-01-01 00:00:02
-1970-01-01 00:00:05
-1970-01-01 00:00:07
-1970-01-01 00:00:10
-1970-01-01 00:00:11
 1970-01-01 00:00:13
-1970-01-01 00:00:16
-1970-01-01 00:00:17
 1970-01-01 00:00:19
 1970-01-01 00:00:23
+1970-01-01 00:00:33
+1970-01-01 00:00:37
+1970-01-01 00:00:51
+1970-01-01 00:00:59
+1970-01-01 00:00:04
+1970-01-01 00:00:10
+1970-01-01 00:00:14
 1970-01-01 00:00:24
-1970-01-01 00:00:30
-1970-01-01 00:00:32
+1970-01-01 00:00:28
 1970-01-01 00:00:34
-1970-01-01 00:00:37
-1970-01-01 00:00:39
-1970-01-01 00:00:42
-1970-01-01 00:00:43
-1970-01-01 00:00:45
+1970-01-01 00:00:38
 1970-01-01 00:00:48
-1970-01-01 00:00:49
-1970-01-01 00:00:51
-1970-01-01 00:00:55
+1970-01-01 00:00:52
 1970-01-01 00:00:56
 1970-01-01 00:00:03
-1970-01-01 00:00:06
+1970-01-01 00:00:07
+1970-01-01 00:00:17
+1970-01-01 00:00:21
+1970-01-01 00:00:27
+1970-01-01 00:00:31
+1970-01-01 00:00:35
+1970-01-01 00:00:39
+1970-01-01 00:00:41
+1970-01-01 00:00:45
 1970-01-01 00:00:08
 1970-01-01 00:00:12
-1970-01-01 00:00:15
 1970-01-01 00:00:18
+1970-01-01 00:00:22
+1970-01-01 00:00:32
+1970-01-01 00:00:36
+1970-01-01 00:00:42
+1970-01-01 00:00:46
+1970-01-01 00:00:01
+1970-01-01 00:00:05
+1970-01-01 00:00:11
+1970-01-01 00:00:15
 1970-01-01 00:00:25
-1970-01-01 00:00:27
-1970-01-01 00:00:28
 1970-01-01 00:00:29
-1970-01-01 00:00:35
-1970-01-01 00:00:38
+1970-01-01 00:00:43
+1970-01-01 00:00:47
+1970-01-01 00:00:49
+1970-01-01 00:00:53
+1970-01-01 00:00:55
+1970-01-01 00:00:57
+1970-01-01 00:00:02
+1970-01-01 00:00:06
+1970-01-01 00:00:16
+1970-01-01 00:00:20
+1970-01-01 00:00:26
+1970-01-01 00:00:30
 1970-01-01 00:00:40
 1970-01-01 00:00:44
-1970-01-01 00:00:47
 1970-01-01 00:00:50
-1970-01-01 00:00:57
+1970-01-01 00:00:54
+1970-01-01 00:00:58
 drop table t2;
 create table t3 (a datetime not null, primary key(a)) engine='InnoDB' 
 partition by range (month(a)) subpartition by key (a)
@@ -1227,17 +1227,17 @@ count(*)
 12
 select * from t3;
 a
+1970-02-01 00:00:00
 1970-01-01 00:00:00
 1970-03-01 00:00:00
-1970-02-01 00:00:00
-1970-06-01 00:00:00
-1970-05-01 00:00:00
 1970-04-01 00:00:00
-1970-07-01 00:00:00
+1970-05-01 00:00:00
+1970-06-01 00:00:00
 1970-08-01 00:00:00
 1970-09-01 00:00:00
-1970-11-01 00:00:00
+1970-07-01 00:00:00
 1970-10-01 00:00:00
+1970-11-01 00:00:00
 1970-12-01 00:00:00
 drop table t3;
 create table t4 (a datetime not null, primary key(a)) engine='InnoDB' 
@@ -1279,17 +1279,17 @@ count(*)
 12
 select * from t4;
 a
+1970-02-01 00:00:00
 1970-01-01 00:00:00
 1970-03-01 00:00:00
-1970-02-01 00:00:00
-1970-06-01 00:00:00
-1970-05-01 00:00:00
 1970-04-01 00:00:00
-1970-07-01 00:00:00
+1970-05-01 00:00:00
+1970-06-01 00:00:00
 1970-08-01 00:00:00
 1970-09-01 00:00:00
-1970-11-01 00:00:00
+1970-07-01 00:00:00
 1970-10-01 00:00:00
+1970-11-01 00:00:00
 1970-12-01 00:00:00
 drop table t4;
 create table t1 (a year not null, primary key(a)) engine='InnoDB' 

=== modified file 'mysql-test/suite/parts/r/partition_datetime_myisam.result'
--- a/mysql-test/suite/parts/r/partition_datetime_myisam.result	2011-03-24 13:10:37 +0000
+++ b/mysql-test/suite/parts/r/partition_datetime_myisam.result	2011-11-02 06:13:46 +0000
@@ -19,9 +19,9 @@ insert into t1 values ('1975-01-01 21:21
 select * from t1;
 a
 2000-06-15 23:59:00
-1980-10-14 03:03:00
-1975-01-01 21:21:21
 2020-12-31 12:10:30
+1975-01-01 21:21:21
+1980-10-14 03:03:00
 select * from t1 where a=19801014030300;
 a
 1980-10-14 03:03:00
@@ -29,8 +29,8 @@ delete from t1 where a=19801014030300;
 select * from t1;
 a
 2000-06-15 23:59:00
-1975-01-01 21:21:21
 2020-12-31 12:10:30
+1975-01-01 21:21:21
 drop table t1;
 create table t2 (a timestamp not null, primary key(a)) engine='MyISAM' 
 partition by key (a) partitions 12;
@@ -124,64 +124,64 @@ count(*)
 59
 select * from t2;
 a
-1971-01-01 00:00:01
-1971-01-01 00:00:04
-1971-01-01 00:00:06
 1971-01-01 00:00:14
-1971-01-01 00:00:16
-1971-01-01 00:00:17
-1971-01-01 00:00:18
-1971-01-01 00:00:22
-1971-01-01 00:00:23
-1971-01-01 00:00:26
-1971-01-01 00:00:27
+1971-01-01 00:00:34
+1971-01-01 00:00:42
+1971-01-01 00:00:58
+1971-01-01 00:00:21
 1971-01-01 00:00:29
-1971-01-01 00:00:30
-1971-01-01 00:00:33
+1971-01-01 00:00:37
+1971-01-01 00:00:53
+1971-01-01 00:00:57
+1971-01-01 00:00:04
+1971-01-01 00:00:08
+1971-01-01 00:00:20
 1971-01-01 00:00:36
-1971-01-01 00:00:38
 1971-01-01 00:00:44
-1971-01-01 00:00:46
-1971-01-01 00:00:53
-1971-01-01 00:00:07
-1971-01-01 00:00:09
+1971-01-01 00:00:11
+1971-01-01 00:00:23
+1971-01-01 00:00:27
+1971-01-01 00:00:31
+1971-01-01 00:00:02
+1971-01-01 00:00:06
 1971-01-01 00:00:10
+1971-01-01 00:00:22
+1971-01-01 00:00:38
+1971-01-01 00:00:50
+1971-01-01 00:00:17
+1971-01-01 00:00:33
+1971-01-01 00:00:45
 1971-01-01 00:00:12
-1971-01-01 00:00:15
+1971-01-01 00:00:52
+1971-01-01 00:00:56
+1971-01-01 00:00:07
 1971-01-01 00:00:19
-1971-01-01 00:00:24
-1971-01-01 00:00:28
+1971-01-01 00:00:35
 1971-01-01 00:00:39
-1971-01-01 00:00:41
-1971-01-01 00:00:42
-1971-01-01 00:00:43
 1971-01-01 00:00:47
-1971-01-01 00:00:48
-1971-01-01 00:00:49
-1971-01-01 00:00:52
-1971-01-01 00:00:55
-1971-01-01 00:00:56
-1971-01-01 00:00:57
-1971-01-01 00:00:02
-1971-01-01 00:00:03
+1971-01-01 00:00:51
+1971-01-01 00:00:18
+1971-01-01 00:00:26
+1971-01-01 00:00:30
+1971-01-01 00:00:46
+1971-01-01 00:00:54
+1971-01-01 00:00:01
 1971-01-01 00:00:05
-1971-01-01 00:00:08
-1971-01-01 00:00:11
+1971-01-01 00:00:09
 1971-01-01 00:00:13
-1971-01-01 00:00:20
-1971-01-01 00:00:21
 1971-01-01 00:00:25
-1971-01-01 00:00:31
+1971-01-01 00:00:41
+1971-01-01 00:00:49
+1971-01-01 00:00:16
+1971-01-01 00:00:24
+1971-01-01 00:00:28
 1971-01-01 00:00:32
-1971-01-01 00:00:34
-1971-01-01 00:00:35
-1971-01-01 00:00:37
 1971-01-01 00:00:40
-1971-01-01 00:00:45
-1971-01-01 00:00:50
-1971-01-01 00:00:51
-1971-01-01 00:00:54
-1971-01-01 00:00:58
+1971-01-01 00:00:48
+1971-01-01 00:00:03
+1971-01-01 00:00:15
+1971-01-01 00:00:43
+1971-01-01 00:00:55
 1971-01-01 00:00:59
 drop table t2;
 create table t1 (a date not null, primary key(a)) engine='MyISAM' 
@@ -545,18 +545,18 @@ insert into t1 values ('21:21:21'), ('12
 select * from t1;
 a
 03:03:03
+21:21:21
 23:59:00
 12:10:30
-21:21:21
 select * from t1 where a=030303;
 a
 03:03:03
 delete from t1 where a=030303;
 select * from t1;
 a
+21:21:21
 23:59:00
 12:10:30
-21:21:21
 drop table t1;
 create table t2 (a time not null, primary key(a)) engine='MyISAM' 
 partition by key (a) partitions 12;
@@ -571,19 +571,19 @@ PARTITIONS 12 */
 insert into t2 values ('0:1:1'), ('10:11:12'), ('13:14:15'), ('14:15:16');
 select * from t2;
 a
-00:01:01
+10:11:12
 13:14:15
 14:15:16
-10:11:12
+00:01:01
 select * from t2 where a='13:14:15';
 a
 13:14:15
 delete from t2 where a='13:14:15';
 select * from t2;
 a
-00:01:01
-14:15:16
 10:11:12
+14:15:16
+00:01:01
 delete from t2;
 59 inserts;
 insert into t2 values (000100+59);
@@ -650,65 +650,65 @@ count(*)
 59
 select * from t2;
 a
-00:01:01
-00:01:13
-00:01:29
-00:01:41
-00:01:53
-00:01:04
-00:01:16
-00:01:32
-00:01:44
-00:01:56
-00:01:03
 00:01:15
-00:01:31
-00:01:43
-00:01:55
-00:01:06
-00:01:18
-00:01:34
-00:01:46
-00:01:58
-00:01:05
-00:01:17
-00:01:33
-00:01:45
-00:01:57
-00:01:08
-00:01:20
-00:01:24
-00:01:36
-00:01:48
-00:01:07
-00:01:19
 00:01:23
-00:01:35
+00:01:39
 00:01:47
 00:01:59
-00:01:10
-00:01:22
-00:01:26
-00:01:38
-00:01:50
-00:01:09
+00:01:16
+00:01:24
+00:01:40
+00:01:48
+00:01:05
+00:01:13
 00:01:21
-00:01:25
 00:01:37
-00:01:49
-00:01:12
-00:01:28
-00:01:40
-00:01:52
+00:01:45
+00:01:57
+00:01:14
+00:01:22
+00:01:38
+00:01:46
+00:01:58
+00:01:03
 00:01:11
-00:01:27
-00:01:39
-00:01:51
+00:01:19
+00:01:35
+00:01:43
+00:01:55
+00:01:04
+00:01:12
+00:01:20
+00:01:36
+00:01:44
+00:01:56
+00:01:01
+00:01:09
+00:01:29
+00:01:33
+00:01:41
+00:01:53
 00:01:02
-00:01:14
-00:01:30
+00:01:10
+00:01:18
+00:01:34
 00:01:42
 00:01:54
+00:01:07
+00:01:27
+00:01:31
+00:01:51
+00:01:08
+00:01:28
+00:01:32
+00:01:52
+00:01:17
+00:01:25
+00:01:49
+00:01:06
+00:01:26
+00:01:30
+00:01:50
 drop table t2;
 create table t3 (a time not null, primary key(a)) engine='MyISAM' 
 partition by range (second(a)) subpartition by key (a)
@@ -796,65 +796,65 @@ count(*)
 59
 select * from t3;
 a
-10:00:02
-10:00:05
 10:00:01
+10:00:06
+10:00:07
+10:00:14
+10:00:15
+10:00:02
 10:00:03
-10:00:04
 10:00:08
 10:00:09
-10:00:14
-10:00:06
-10:00:07
+10:00:04
+10:00:05
 10:00:10
 10:00:11
 10:00:12
 10:00:13
-10:00:15
-10:00:16
-10:00:18
-10:00:19
-10:00:25
-10:00:30
 10:00:20
 10:00:21
-10:00:22
+10:00:26
 10:00:27
-10:00:29
+10:00:16
 10:00:17
+10:00:22
 10:00:23
-10:00:24
-10:00:26
 10:00:28
-10:00:39
-10:00:40
-10:00:41
-10:00:42
-10:00:43
-10:00:31
+10:00:29
+10:00:18
+10:00:19
+10:00:24
+10:00:25
+10:00:30
 10:00:32
 10:00:33
-10:00:34
 10:00:35
+10:00:40
+10:00:41
+10:00:34
 10:00:36
 10:00:37
+10:00:42
+10:00:43
+10:00:31
 10:00:38
+10:00:39
 10:00:44
 10:00:45
-10:00:54
 10:00:46
-10:00:47
+10:00:48
 10:00:49
+10:00:54
+10:00:55
 10:00:50
 10:00:51
+10:00:56
+10:00:57
+10:00:59
+10:00:47
 10:00:52
 10:00:53
-10:00:55
-10:00:57
 10:00:58
-10:00:59
-10:00:48
-10:00:56
 drop table t3;
 create table t4 (a time not null, primary key(a)) engine='MyISAM' 
 partition by list (second(a)) subpartition by key (a)
@@ -942,65 +942,65 @@ count(*)
 59
 select * from t4;
 a
-10:00:02
-10:00:05
 10:00:01
+10:00:06
+10:00:07
+10:00:14
+10:00:15
+10:00:02
 10:00:03
-10:00:04
 10:00:08
 10:00:09
-10:00:14
-10:00:06
-10:00:07
+10:00:04
+10:00:05
 10:00:10
 10:00:11
 10:00:12
 10:00:13
-10:00:15
-10:00:16
-10:00:18
-10:00:19
-10:00:25
-10:00:30
 10:00:20
 10:00:21
-10:00:22
+10:00:26
 10:00:27
-10:00:29
+10:00:16
 10:00:17
+10:00:22
 10:00:23
-10:00:24
-10:00:26
 10:00:28
-10:00:39
-10:00:40
-10:00:41
-10:00:42
-10:00:43
-10:00:31
+10:00:29
+10:00:18
+10:00:19
+10:00:24
+10:00:25
+10:00:30
 10:00:32
 10:00:33
-10:00:34
 10:00:35
+10:00:40
+10:00:41
+10:00:34
 10:00:36
 10:00:37
+10:00:42
+10:00:43
+10:00:31
 10:00:38
+10:00:39
 10:00:44
 10:00:45
-10:00:54
 10:00:46
-10:00:47
+10:00:48
 10:00:49
+10:00:54
+10:00:55
 10:00:50
 10:00:51
+10:00:56
+10:00:57
+10:00:59
+10:00:47
 10:00:52
 10:00:53
-10:00:55
-10:00:57
 10:00:58
-10:00:59
-10:00:48
-10:00:56
 drop table t4;
 create table t1 (a datetime not null, primary key(a)) engine='MyISAM' 
 partition by key (a) (
@@ -1022,9 +1022,9 @@ t1	CREATE TABLE `t1` (
 insert into t1 values ('1975-01-01 21:21:21'), ('2020-12-31 12:10:30'), ('1980-10-14 03:03'), ('2000-06-15 23:59');
 select * from t1;
 a
-2020-12-31 12:10:30
-2000-06-15 23:59:00
 1975-01-01 21:21:21
+2000-06-15 23:59:00
+2020-12-31 12:10:30
 1980-10-14 03:03:00
 select * from t1 where a=19801014030300;
 a
@@ -1032,9 +1032,9 @@ a
 delete from t1 where a=19801014030300;
 select * from t1;
 a
-2020-12-31 12:10:30
-2000-06-15 23:59:00
 1975-01-01 21:21:21
+2000-06-15 23:59:00
+2020-12-31 12:10:30
 drop table t1;
 create table t2 (a datetime not null, primary key(a)) engine='MyISAM' 
 partition by key (a) partitions 12;
@@ -1049,8 +1049,8 @@ PARTITIONS 12 */
 insert into t2 values ('1975-01-01 0:1:1'), ('2020-12-31 10:11:12'), ('1980-10-14 13:14:15'), ('2000-06-15 14:15:16');
 select * from t2;
 a
-2000-06-15 14:15:16
 2020-12-31 10:11:12
+2000-06-15 14:15:16
 1980-10-14 13:14:15
 1975-01-01 00:01:01
 select * from t2 where a='1980-10-14 13:14:15';
@@ -1059,8 +1059,8 @@ a
 delete from t2 where a='1980-10-14 13:14:15';
 select * from t2;
 a
-2000-06-15 14:15:16
 2020-12-31 10:11:12
+2000-06-15 14:15:16
 1975-01-01 00:01:01
 delete from t2;
 59 inserts;
@@ -1128,65 +1128,65 @@ count(*)
 59
 select * from t2;
 a
-1970-01-01 00:00:01
-1970-01-01 00:00:04
 1970-01-01 00:00:09
-1970-01-01 00:00:14
-1970-01-01 00:00:20
-1970-01-01 00:00:21
-1970-01-01 00:00:22
-1970-01-01 00:00:26
-1970-01-01 00:00:31
-1970-01-01 00:00:33
-1970-01-01 00:00:36
-1970-01-01 00:00:41
-1970-01-01 00:00:46
-1970-01-01 00:00:52
-1970-01-01 00:00:53
-1970-01-01 00:00:54
-1970-01-01 00:00:58
-1970-01-01 00:00:59
-1970-01-01 00:00:02
-1970-01-01 00:00:05
-1970-01-01 00:00:07
-1970-01-01 00:00:10
-1970-01-01 00:00:11
 1970-01-01 00:00:13
-1970-01-01 00:00:16
-1970-01-01 00:00:17
 1970-01-01 00:00:19
 1970-01-01 00:00:23
+1970-01-01 00:00:33
+1970-01-01 00:00:37
+1970-01-01 00:00:51
+1970-01-01 00:00:59
+1970-01-01 00:00:04
+1970-01-01 00:00:10
+1970-01-01 00:00:14
 1970-01-01 00:00:24
-1970-01-01 00:00:30
-1970-01-01 00:00:32
+1970-01-01 00:00:28
 1970-01-01 00:00:34
-1970-01-01 00:00:37
-1970-01-01 00:00:39
-1970-01-01 00:00:42
-1970-01-01 00:00:43
-1970-01-01 00:00:45
+1970-01-01 00:00:38
 1970-01-01 00:00:48
-1970-01-01 00:00:49
-1970-01-01 00:00:51
-1970-01-01 00:00:55
+1970-01-01 00:00:52
 1970-01-01 00:00:56
 1970-01-01 00:00:03
-1970-01-01 00:00:06
+1970-01-01 00:00:07
+1970-01-01 00:00:17
+1970-01-01 00:00:21
+1970-01-01 00:00:27
+1970-01-01 00:00:31
+1970-01-01 00:00:35
+1970-01-01 00:00:39
+1970-01-01 00:00:41
+1970-01-01 00:00:45
 1970-01-01 00:00:08
 1970-01-01 00:00:12
-1970-01-01 00:00:15
 1970-01-01 00:00:18
+1970-01-01 00:00:22
+1970-01-01 00:00:32
+1970-01-01 00:00:36
+1970-01-01 00:00:42
+1970-01-01 00:00:46
+1970-01-01 00:00:01
+1970-01-01 00:00:05
+1970-01-01 00:00:11
+1970-01-01 00:00:15
 1970-01-01 00:00:25
-1970-01-01 00:00:27
-1970-01-01 00:00:28
 1970-01-01 00:00:29
-1970-01-01 00:00:35
-1970-01-01 00:00:38
+1970-01-01 00:00:43
+1970-01-01 00:00:47
+1970-01-01 00:00:49
+1970-01-01 00:00:53
+1970-01-01 00:00:55
+1970-01-01 00:00:57
+1970-01-01 00:00:02
+1970-01-01 00:00:06
+1970-01-01 00:00:16
+1970-01-01 00:00:20
+1970-01-01 00:00:26
+1970-01-01 00:00:30
 1970-01-01 00:00:40
 1970-01-01 00:00:44
-1970-01-01 00:00:47
 1970-01-01 00:00:50
-1970-01-01 00:00:57
+1970-01-01 00:00:54
+1970-01-01 00:00:58
 drop table t2;
 create table t3 (a datetime not null, primary key(a)) engine='MyISAM' 
 partition by range (month(a)) subpartition by key (a)
@@ -1227,17 +1227,17 @@ count(*)
 12
 select * from t3;
 a
+1970-02-01 00:00:00
 1970-01-01 00:00:00
 1970-03-01 00:00:00
-1970-02-01 00:00:00
-1970-06-01 00:00:00
-1970-05-01 00:00:00
 1970-04-01 00:00:00
-1970-07-01 00:00:00
+1970-05-01 00:00:00
+1970-06-01 00:00:00
 1970-08-01 00:00:00
 1970-09-01 00:00:00
-1970-11-01 00:00:00
+1970-07-01 00:00:00
 1970-10-01 00:00:00
+1970-11-01 00:00:00
 1970-12-01 00:00:00
 drop table t3;
 create table t4 (a datetime not null, primary key(a)) engine='MyISAM' 
@@ -1279,17 +1279,17 @@ count(*)
 12
 select * from t4;
 a
+1970-02-01 00:00:00
 1970-01-01 00:00:00
 1970-03-01 00:00:00
-1970-02-01 00:00:00
-1970-06-01 00:00:00
-1970-05-01 00:00:00
 1970-04-01 00:00:00
-1970-07-01 00:00:00
+1970-05-01 00:00:00
+1970-06-01 00:00:00
 1970-08-01 00:00:00
 1970-09-01 00:00:00
-1970-11-01 00:00:00
+1970-07-01 00:00:00
 1970-10-01 00:00:00
+1970-11-01 00:00:00
 1970-12-01 00:00:00
 drop table t4;
 create table t1 (a year not null, primary key(a)) engine='MyISAM' 

=== modified file 'mysql-test/t/type_temporal_fractional.test'
--- a/mysql-test/t/type_temporal_fractional.test	2011-11-01 11:52:24 +0000
+++ b/mysql-test/t/type_temporal_fractional.test	2011-11-02 06:13:46 +0000
@@ -6698,11 +6698,14 @@ CREATE TABLE t1 (
   KEY col_time_2_key (col_time_2_key)
 )/*!50100 PARTITION BY KEY (pk)PARTITIONS 2 */;
 INSERT INTO t1 VALUES ('00:20:02','2007-08-09 05:14:12.05054','2007-06-20 21:00:00.000000','06:16:36.0','2011-09-09 21:37:45.2','19:15:37.02'),('18:00:14','0000-00-00 00:00:00.00000','2000-12-10 12:35:01.029761','00:20:04.0','2011-09-09 21:37:46.2','06:21:03.03');
+# different warnings in server and embedded run
+--disable_warnings
 SELECT col_time_1 AS c1 
 FROM t1 
 WHERE col_time_not_null_key <= col_timestamp_6_key
 AND col_time_2_key > SUBTIME('2006-07-16', '05:05:02.040778')
 ORDER BY col_datetime_5_not_null_key, col_time_1;
+--enable_warnings
 DROP TABLE t1;
 
 #

=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc	2011-11-01 11:52:24 +0000
+++ b/sql/item_cmpfunc.cc	2011-11-02 06:13:46 +0000
@@ -447,25 +447,29 @@ static bool convert_constant_item(THD *t
     if (!(*item)->is_null() && !(*item)->save_in_field(field, 1)) // TS-TODO
     {
       Item *tmp= field->type() == MYSQL_TYPE_TIME ?
-                   /*new Item_time_with_ref(field->decimals(),
-                                          field->val_time_temporal(), *item) :*/
+#define OLD_CMP
+#ifdef OLD_CMP
+                   new Item_time_with_ref(field->decimals(),
+                                          field->val_time_temporal(), *item) :
+#else
                    new Item_time_with_ref(max((*item)->time_precision(),
                                               field->decimals()),
                                           (*item)->val_time_temporal(),
                                           *item) :
+#endif
                  field->is_temporal_with_date() ?
-                 /*
+#ifdef OLD_CMP
                    new Item_datetime_with_ref(field->type(),
                                                field->decimals(),
                                                field->val_date_temporal(),
                                                *item) :
-                  */
+#else
                    new Item_datetime_with_ref(field->type(),
                                               max((*item)->datetime_precision(),
                                                   field->decimals()),
                                               (*item)->val_date_temporal(),
                                               *item) :
-                   
+#endif
                    new Item_int_with_ref(field->val_int(), *item,
                                          test(field->flags & UNSIGNED_FLAG));
       if (tmp)

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2011-11-01 11:52:24 +0000
+++ b/sql/log_event.cc	2011-11-02 06:13:46 +0000
@@ -1957,7 +1957,6 @@ log_event_print_value(IO_CACHE *file, co
 
   case MYSQL_TYPE_TIMESTAMP2:
     {
-      DBUG_ASSERT(meta);
       char buf[MAX_DATE_STRING_REP_LENGTH];
       struct timeval tm;
       my_timestamp_from_binary(&tm, ptr, meta);
@@ -1982,7 +1981,6 @@ log_event_print_value(IO_CACHE *file, co
 
   case MYSQL_TYPE_DATETIME2:
     {
-      DBUG_ASSERT(meta);
       char buf[MAX_DATE_STRING_REP_LENGTH];
       MYSQL_TIME ltime;
       longlong packed= my_datetime_packed_from_binary(ptr, meta);
@@ -2004,7 +2002,6 @@ log_event_print_value(IO_CACHE *file, co
 
   case MYSQL_TYPE_TIME2:
     {
-      DBUG_ASSERT(meta);
       char buf[MAX_DATE_STRING_REP_LENGTH];
       MYSQL_TIME ltime;
       longlong packed= my_time_packed_from_binary(ptr, meta);

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (alexander.barkov:3544 to 3545) WL#946Alexander Barkov7 Nov