From: Mayank Prasad Date: February 13 2012 9:02am Subject: bzr push into mysql-trunk-wl5767 branch (mayank.prasad:3432 to 3433) WL#5767 List-Archive: http://lists.mysql.com/commits/142843 Message-Id: <201202130902.q1D92nkb032180@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3433 Mayank Prasad 2012-02-13 [merge] WL#5767 : Performance Schema, Statements Digest Details: - Merge mysql-trunk -> mysql-trunk-wl5767 modified: mysql-test/r/ps_2myisam.result mysql-test/r/ps_3innodb.result mysql-test/r/ps_4heap.result mysql-test/r/ps_5merge.result mysql-test/r/type_temporal_fractional.result mysql-test/r/type_time.result sql/field.cc sql/item_cmpfunc.cc 3432 Christopher Powers 2012-02-12 [merge] merge with mysql-trunk added: mysql-test/r/archive_no_symlink.result mysql-test/r/archive_symlink.result mysql-test/t/archive_no_symlink-master.opt mysql-test/t/archive_no_symlink.test mysql-test/t/archive_symlink.test === modified file 'mysql-test/r/ps_2myisam.result' --- a/mysql-test/r/ps_2myisam.result 2012-02-07 20:32:47 +0000 +++ b/mysql-test/r/ps_2myisam.result 2012-02-13 06:26:52 +0000 @@ -2962,25 +2962,31 @@ test_sequence -- insert into date/time columns -- Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Warning 1265 Data truncated for column 'c13' at row 1 === modified file 'mysql-test/r/ps_3innodb.result' --- a/mysql-test/r/ps_3innodb.result 2012-02-07 20:32:47 +0000 +++ b/mysql-test/r/ps_3innodb.result 2012-02-13 06:26:52 +0000 @@ -2945,25 +2945,31 @@ test_sequence -- insert into date/time columns -- Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Warning 1265 Data truncated for column 'c13' at row 1 === modified file 'mysql-test/r/ps_4heap.result' --- a/mysql-test/r/ps_4heap.result 2012-02-07 20:32:47 +0000 +++ b/mysql-test/r/ps_4heap.result 2012-02-13 06:26:52 +0000 @@ -2946,25 +2946,31 @@ test_sequence -- insert into date/time columns -- Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Warning 1265 Data truncated for column 'c13' at row 1 === modified file 'mysql-test/r/ps_5merge.result' --- a/mysql-test/r/ps_5merge.result 2012-02-07 20:32:47 +0000 +++ b/mysql-test/r/ps_5merge.result 2012-02-13 06:26:52 +0000 @@ -2882,25 +2882,31 @@ test_sequence -- insert into date/time columns -- Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Warning 1265 Data truncated for column 'c13' at row 1 @@ -5902,25 +5908,31 @@ test_sequence -- insert into date/time columns -- Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 Warnings: Note 1265 Data truncated for column 'c13' at row 1 +Note 1265 Data truncated for column 'c16' at row 1 Warning 1265 Data truncated for column 'c17' at row 1 Warnings: Warning 1265 Data truncated for column 'c13' at row 1 === modified file 'mysql-test/r/type_temporal_fractional.result' --- a/mysql-test/r/type_temporal_fractional.result 2012-02-07 20:32:47 +0000 +++ b/mysql-test/r/type_temporal_fractional.result 2012-02-13 06:26:52 +0000 @@ -17027,6 +17027,9 @@ INSERT INTO t1 VALUES (SEC_TO_TIME(46),'20030628121312.000376','20020323065409.039577'), (SEC_TO_TIME(48),'20071219173306.048009',NULL), (SEC_TO_TIME(50),'0000-00-00',NULL); +Warnings: +Note 1265 Data truncated for column 'c_time' at row 2 +Note 1265 Data truncated for column 'c_time' at row 3 SELECT c_time FROM t1; c_time 00:00:00 === modified file 'mysql-test/r/type_time.result' --- a/mysql-test/r/type_time.result 2012-02-09 17:07:12 +0000 +++ b/mysql-test/r/type_time.result 2012-02-13 06:26:52 +0000 @@ -1,6 +1,8 @@ drop table if exists t1; create table t1 (t time); insert into t1 values("10:22:33"),("12:34:56.78"),(10),(1234),(123456.78),(1234559.99),("1"),("1:23"),("1:23:45"), ("10.22"), ("-10 1:22:33.45"),("20 10:22:33"),("1999-02-03 20:33:34"); +Warnings: +Note 1265 Data truncated for column 't' at row 13 insert t1 values (30),(1230),("1230"),("12:30"),("12:30:35"),("1 12:30:31.32"); select * from t1; t === modified file 'sql/field.cc' --- a/sql/field.cc 2012-02-07 20:32:47 +0000 +++ b/sql/field.cc 2012-02-13 06:26:52 +0000 @@ -4861,8 +4861,10 @@ Field_temporal::store(const char *str, u } else { - error= test(status.warnings) | - store_internal_with_round(<ime, &status.warnings); + error= test(status.warnings); // Test convert_str_to_TIME warnings + const int error2= store_internal_with_round(<ime, &status.warnings); + if (!error) + error= error2; } if (status.warnings) set_warnings(ErrConvString(str, len, cs), status.warnings); @@ -5808,7 +5810,17 @@ longlong Field_timef::val_time_temporal( int Field_timef::store_internal(const MYSQL_TIME *ltime, int *warnings) { - return store_packed(TIME_to_longlong_time_packed(ltime)); + int rc= store_packed(TIME_to_longlong_time_packed(ltime)); + if (rc == 0 && non_zero_date(ltime)) + { + /* + The DATE part got lost; we warn, like in Field_newdate::store_internal, + and trigger some code in get_mm_leaf() (see err==3 there). + */ + *warnings|= MYSQL_TIME_NOTE_TRUNCATED; + rc= 3; + } + return rc; } === modified file 'sql/item_cmpfunc.cc' --- a/sql/item_cmpfunc.cc 2012-02-08 15:25:17 +0000 +++ b/sql/item_cmpfunc.cc 2012-02-13 06:26:52 +0000 @@ -449,7 +449,9 @@ static bool convert_constant_item(THD *t (STATUS_GARBAGE | STATUS_NOT_FOUND)))); if (save_field_value) orig_field_val= field->val_int(); - if (!(*item)->is_null() && !(*item)->save_in_field(field, 1)) // TS-TODO + int rc; + if (!(*item)->is_null() && + (((rc= (*item)->save_in_field(field, 1)) == 0) || rc == 3)) // TS-TODO { int field_cmp= 0; /* No bundle (reason: useless for push emails).