• vasil's avatar
    branches/zip: Merge r6198:6206 from branches/5.1: · 8ae5ee8d
    vasil authored
    (r6203 was skipped as it is already in branches/zip)
    
      ------------------------------------------------------------------------
      r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
      Changed paths:
         M /branches/5.1/btr/btr0btr.c
      
      branches/5.1:
      
      White space fixup - indent under the opening (
      
      ------------------------------------------------------------------------
      r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
      Changed paths:
         M /branches/5.1/btr/btr0btr.c
      
      branches/5.1: Use btr_free_root() instead of fseg_free() for
      the fix of bug #48469, because fseg_free() is not defined
      in the zip branch. And we could save one mini-trasaction started
      by fseg_free().
      
      Approved by Marko.
      
      
      ------------------------------------------------------------------------
      r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
      
      branches/5.1: Add a special case to handle the Duplicated Key error
      and return DB_ERROR instead. This is to avoid a possible SIGSEGV
      by mysql error handling re-entering the storage layer for dup key
      info without proper table handle.
      This is to prevent a server crash when error situation in bug
      #45961 "DDL on partitioned innodb tables leaves data dictionary
      in an inconsistent state" happens.
      
      rb://157 approved by Sunny Bains.
      
      
      ------------------------------------------------------------------------
      r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
      Changed paths:
         M /branches/5.1/handler/ha_innodb.cc
      
      branches/5.1: Fix a minor code formating issue for 
      the parenthesis iplacement of the if condition in
      rename_table().
      
      
      ------------------------------------------------------------------------
    8ae5ee8d
ha_innodb.cc 297 KB