bzr push into mysql-trunk branch (tor.didriksen:3701 to 3702) WL#946

[Tor Didriksen]

 3702 Tor Didriksen	2012-01-04
      WL#946 Post-push fix:
      In Field_year::store_time(), store the year of a MYSQL_TIMESTAMP_DATE
      rather than trying to add current time.

    modified:
      sql/field.cc
 3701 kinoyasu	2012-01-04 [merge]
      Bug#12400341 INNODB CAN LEAVE ORPHAN IBD FILES AROUND
      
      If we meet DB_TOO_MANY_CONCURRENT_TRXS during the execution tab_create_graph from row_create_table_for_mysql(), .ibd file for the table should be created already but was not deleted for the error handling.
      
      rb:875 approved by Jimmy Yang

    added:
      mysql-test/suite/innodb/r/innodb_bug12400341.result
      mysql-test/suite/innodb/t/innodb_bug12400341-master.opt
      mysql-test/suite/innodb/t/innodb_bug12400341.test
    modified:
      storage/innobase/row/row0mysql.cc
=== modified file 'sql/field.cc'
--- a/sql/field.cc	2011-12-15 15:15:37 +0000
+++ b/sql/field.cc	2012-01-04 12:47:36 +0000
@@ -5925,7 +5925,8 @@ int
 Field_year::store_time(MYSQL_TIME *ltime,
                        uint8 dec_arg __attribute__((unused)))
 {
-  if (ltime->time_type != MYSQL_TIMESTAMP_DATETIME)
+  if (ltime->time_type != MYSQL_TIMESTAMP_DATETIME &&
+      ltime->time_type != MYSQL_TIMESTAMP_DATE)
   {
     /* Convert time to datetime, then store year of the result */
     THD *thd= table ? table->in_use : current_thd;

No bundle (reason: useless for push emails).