• vasil's avatar
    branches/zip: Merge r5912:6112 from branches/5.1: · fcf47d52
    vasil authored
    (after this merge the innodb-autoinc test starts to fail, but
    I commit anyway because it would be easier to investigate the
    failure this way)
    
      ------------------------------------------------------------------------
      r5952 | calvin | 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) | 7 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
      
      branches/5.1: fix bug#42383: Can't create table 'test.bug39438'
      
      For embedded server, MySQL may pass in full path, which is
      currently disallowed. It is needed to relax the condition by
      accepting full paths in the embedded case.
      
      Approved by: Heikki (on IM)
      ------------------------------------------------------------------------
      r6032 | vasil | 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) | 8 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
      
      branches/5.1:
      
      Fix Bug#38996 Race condition in ANALYZE TABLE
      
      by serializing ANALYZE TABLE inside InnoDB.
      
      Approved by:	Heikki (rb://175)
      
      ------------------------------------------------------------------------
      r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
         A /branches/5.1/mysql-test/innodb_bug47777.result
         A /branches/5.1/mysql-test/innodb_bug47777.test
      
      branches/5.1: Fix bug #47777. Treat the Geometry data same as
      Binary BLOB in ha_innobase::store_key_val_for_row(), since the
      Geometry data is stored as Binary BLOB in Innodb.
      
      Review: rb://180 approved by Marko Makela.
      
      
      ------------------------------------------------------------------------
      r6051 | sunny | 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) | 6 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
         M /branches/5.1/mysql-test/innodb-autoinc.result
         M /branches/5.1/mysql-test/innodb-autoinc.test
      
      branches/5.1: Ignore negative values supplied by the user when calculating the
      next value to store in dict_table_t. Setting autoincrement columns top negative
      values is undefined behavior and this change should bring the behavior of
      InnoDB closer to what users expect. Added several tests to check.
      rb://162
      
      ------------------------------------------------------------------------
      r6052 | sunny | 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) | 4 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
         M /branches/5.1/mysql-test/innodb-autoinc.result
         M /branches/5.1/mysql-test/innodb-autoinc.test
      
      branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix
      the test results too.
      rb://164
      
      ------------------------------------------------------------------------
      r6053 | sunny | 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) | 6 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
         M /branches/5.1/mysql-test/innodb-autoinc.result
         M /branches/5.1/mysql-test/innodb-autoinc.test
      
      branches/5.1: Copy the maximum AUTOINC value from the old table to the new
      table when MySQL does a CREATE INDEX ON T. This is required because MySQL
      does a table copy, rename and drops the old table.
      Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb
      rb://168
      
      ------------------------------------------------------------------------
      r6076 | vasil | 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) | 4 lines
      Changed paths:
         M /branches/5.1/row/row0mysql.c
      
      branches/5.1:
      
      Fix typo.
      
      ------------------------------------------------------------------------
    fcf47d52
row0mysql.c 115 KB