← Back to branch summary

~drizzle-trunk/drizzle/development

[patch 125/129] Merge patch for revision 1943 from InnoDB SVN:
revno: 1943
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6207
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6202
committer: vasil
timestamp: Fri 2009-11-20 08:19:14 +0000
message:
  branches/zip: Merge r6198:6206 from branches/5.1:
  
  (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().
    
    
    ------------------------------------------------------------------------
modified:
  handler/ha_innodb.cc           2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
diff:
=== modified file 'handler/ha_innodb.cc'
Filename Latest Rev Last Changed Committer Comment Size
..
cslib 1548.2.1 14 years ago Barry.Leslie at PrimeBase Added the PBMS daemon plugin. (Augen zu und durch Diff
alias_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 28.3 KB Diff Download File
alias_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 11.3 KB Diff Download File
api_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 7.5 KB Diff Download File
backup_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 17.3 KB Diff Download File
backup_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 4.4 KB Diff Download File
cloud_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 15 KB Diff Download File
cloud_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 7.1 KB Diff Download File
compactor_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 10 KB Diff Download File
compactor_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 1.6 KB Diff Download File
connection_handler_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 16.3 KB Diff Download File
connection_handler_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2 KB Diff Download File
database_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 41.8 KB Diff Download File
database_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 7.8 KB Diff Download File
defs_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 9.2 KB Diff Download File
discover_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 43.6 KB Diff Download File
discover_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2.5 KB Diff Download File
engine_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 19.2 KB Diff Download File
engine_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 3 KB Diff Download File
events_ms.cc 1672.3.6 14 years ago Brian Aker First pass in encapsulating row 18.7 KB Diff Download File
events_ms.h 1548.2.6 14 years ago Barry.Leslie at PrimeBase trunk merge plus more pbms updates for drizzle. 1.6 KB Diff Download File
ha_pbms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 23.5 KB Diff Download File
ha_pbms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 3.9 KB Diff Download File
metadata_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 932 bytes Diff Download File
metadata_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2.6 KB Diff Download File
mysql_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2.3 KB Diff Download File
mysql_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 1.2 KB Diff Download File
network_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 6.2 KB Diff Download File
network_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2 KB Diff Download File
open_table_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 27.2 KB Diff Download File
open_table_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 6.6 KB Diff Download File
parameters_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 15.2 KB Diff Download File
parameters_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 1.7 KB Diff Download File
pbms.h 1644.3.8 14 years ago Barry.Leslie at PrimeBase Switched license fro GPL to BSD for source that ca 23.1 KB Diff Download File
pbms_enabled.cc 1672.3.6 14 years ago Brian Aker First pass in encapsulating row 12.2 KB Diff Download File
pbms_enabled.h 1644.3.8 14 years ago Barry.Leslie at PrimeBase Switched license fro GPL to BSD for source that ca 5.4 KB Diff Download File
pbmsdaemon_ms.cc 1548.2.24 14 years ago Barry.Leslie at PrimeBase Reorganized code while fixing some minor problems. 1.7 KB Diff Download File
pbmsdaemon_ms.h 1548.2.14 14 years ago Barry.Leslie at PrimeBase Code cleanup. 1.2 KB Diff Download File
pbmslib.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 5.4 KB Diff Download File
plugin_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2.8 KB Diff Download File
repository_ms.cc 1816.2.3 14 years ago Monty Taylor Fixed some more ICC warnings. How did I get starte 58.3 KB Diff Download File
repository_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 19.1 KB Diff Download File
systab_backup_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 18.4 KB Diff Download File
systab_backup_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2.2 KB Diff Download File
systab_cloud_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 13.2 KB Diff Download File
systab_cloud_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2.1 KB Diff Download File
systab_dump_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 15.4 KB Diff Download File
systab_dump_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 1.7 KB Diff Download File
systab_enabled_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 4.5 KB Diff Download File
systab_enabled_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 1.4 KB Diff Download File
systab_httpheader_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 9.1 KB Diff Download File
systab_httpheader_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2.3 KB Diff Download File
systab_util_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 6.7 KB Diff Download File
systab_util_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2.1 KB Diff Download File
systab_variable_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 16.4 KB Diff Download File
systab_variable_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2.2 KB Diff Download File
system_table_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 67 KB Diff Download File
system_table_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 12.4 KB Diff Download File
table_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 11.9 KB Diff Download File
table_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 4.4 KB Diff Download File
temp_log_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 10.7 KB Diff Download File
temp_log_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 3.9 KB Diff Download File
trans_cache_ms.cc 1816.2.3 14 years ago Monty Taylor Fixed some more ICC warnings. How did I get starte 16.3 KB Diff Download File
trans_cache_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 4.8 KB Diff Download File
trans_log_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 35.3 KB Diff Download File
trans_log_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 12.1 KB Diff Download File
transaction_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 11.5 KB Diff Download File
transaction_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 2.1 KB Diff Download File
TransTest.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 25.2 KB Diff Download File
udf_ms.cc 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 18.1 KB Diff Download File
version_ms.h 1802.10.2 14 years ago Monty Taylor Update all of the copyright headers to include the 1.2 KB Diff Download File