bzr push into mysql-trunk branch (alexander.barkov:3561 to 3562) WL#946

[Alexander Barkov]

 3562 Alexander Barkov	2011-11-15
      WL#946: Bug #13391370   ASSERT FAILURE IN TIME_TO_LONGLONG_DATETIME_PACKED
      
      Fixing bug report number incorrectly mentioned in the previous commit.

    modified:
      mysql-test/r/type_temporal_fractional.result
      mysql-test/t/type_temporal_fractional.test
 3561 Alexander Barkov	2011-11-15
      WL#946: BUG#13386657 ASSERT FAILURE IN ITEM::GET_DATE_FROM_NON_TEMPORAL, PART2

    modified:
      mysql-test/r/type_temporal_fractional.result
      mysql-test/t/type_temporal_fractional.test
      sql/item.cc
=== modified file 'mysql-test/r/type_temporal_fractional.result'
--- a/mysql-test/r/type_temporal_fractional.result	2011-11-15 13:06:17 +0000
+++ b/mysql-test/r/type_temporal_fractional.result	2011-11-15 13:50:16 +0000
@@ -16378,7 +16378,7 @@ ROUND(COALESCE(a,a))
 20010101102031
 DROP TABLE t1;
 #
-# BUG#13386657 ASSERT FAILURE IN ITEM::GET_DATE_FROM_NON_TEMPORAL, PART2
+# Bug#13391370 ASSERT FAILURE IN TIME_TO_LONGLONG_DATETIME_PACKED
 #
 SET timestamp=UNIX_TIMESTAMP('2011-11-15 16:25:30');
 CREATE TABLE t1 (

=== modified file 'mysql-test/t/type_temporal_fractional.test'
--- a/mysql-test/t/type_temporal_fractional.test	2011-11-15 13:06:17 +0000
+++ b/mysql-test/t/type_temporal_fractional.test	2011-11-15 13:50:16 +0000
@@ -7008,7 +7008,7 @@ SELECT ROUND(COALESCE(a,a)) FROM t1;
 DROP TABLE t1;
 
 --echo #
---echo # BUG#13386657 ASSERT FAILURE IN ITEM::GET_DATE_FROM_NON_TEMPORAL, PART2
+--echo # Bug#13391370 ASSERT FAILURE IN TIME_TO_LONGLONG_DATETIME_PACKED
 --echo #
 SET timestamp=UNIX_TIMESTAMP('2011-11-15 16:25:30');
 CREATE TABLE t1 (

No bundle (reason: useless for push emails).