1. 11 Oct, 2010 10 commits
    • Vasil Dimov's avatar
      Merge mysql-5.5-innodb -> mysql-5.5-bugteam · 0b29085c
      Vasil Dimov authored
      0b29085c
    • Luis Soares's avatar
      Automerged bzr bundle. · 2330a5e2
      Luis Soares authored
      2330a5e2
    • Luis Soares's avatar
      Fix for crash in mysqld --verbose --help while initializing option · f2dabc49
      Luis Soares authored
      for --init-rpl-role.
      
      Problem: There are two variables involved in this issue,
      rpl_status and rpl_role_type. The former is an array containing
      the description of the possible values for the latter.
      
      rpl_status is declared as an enumeration and is stored in a 4
      bytes integer. On the other hand, my_getopt, reads enum values
      into a ulong:
      
        *(ulong*)value= arg;
      
      This is overwriting the memory used for rpl_role_type, 
      corrupting the first entry in the array.
      
      Fix: We fix this by re-declaring rpl_status as a ulong, so that it
      has space to accommodate the value "parsed" in my_getopt .
      f2dabc49
    • Jimmy Yang's avatar
      0062e693
    • Jimmy Yang's avatar
      A more complete fix for bug #57345 btr_pcur_store_position abort for load · f3a8c2be
      Jimmy Yang authored
      with concurrent lock/unlock tables
      
      Approved by Marko
      f3a8c2be
    • Vasil Dimov's avatar
      Merge mysql-5.5-innodb -> mysql-5.5-bugteam · c79a0142
      Vasil Dimov authored
      c79a0142
    • 's avatar
      Null merge · da6cd49b
      authored
      The bug happened only on 5.1
      da6cd49b
    • 's avatar
      Bug#56226 Table map set to 0 after altering MyISAM table · d7767d4a
      authored
      After ALTER TABLE which changed only table's metadata, row-based
      binlog sometimes got corrupted since the tablemap was unexpectedly
      set to 0 for subsequent updates to the same table.
      
      ALTER TABLE which changed only table's metadata always reset
      table_map_id for the table share to 0. Despite the fact that
      0 is a valid value for table_map_id, this step caused problems
      as it could have created situation in which we had more than
      one table share with table_map_id equal 0. If more than one
      table with table_map_id are 0 were updated in the same statement,
      updates to these different tables were written into the same
      rows event. This caused slave server to crash.
      
      This bug happens only on 5.1. It doesn't affect 5.5+.
      
      This patch solves this problem by ensuring that ALTER TABLE
      statements which change metadata only never reset table_map_id
      to 0. To do this it changes reopen_table() to correctly use
      refreshed table_map_id value instead of using the old one/
      resetting it.
      d7767d4a
    • 's avatar
      Postfix for BUG#55375 · 36a2727e
      authored
      Removed option file and changed result file.
      36a2727e
    • Sunny Bains's avatar
      Bug# 56982 Assertion Failure from ha_innobase::innobase_peek_autoinc() when auto_inc > 0 · 34b889e1
      Sunny Bains authored
      Print an error message to stderr an get rid of the assertion.
      
      Approved by: Jimmy Yang (over IM)
      34b889e1
  2. 10 Oct, 2010 2 commits
  3. 09 Oct, 2010 2 commits
    • 's avatar
      Manual merge · a667ce8e
      authored
      a667ce8e
    • 's avatar
      Bug#55375 Transaction bigger than max_binlog_cache_size crashes slave · b6682591
      authored
      When slave executes a transaction bigger than slave's max_binlog_cache_size,
      slave will crash. It is caused by the assert that server should only roll back
      the statement but not the whole transaction if the error ER_TRANS_CACHE_FULL 
      happens. But slave sql thread always rollbacks the whole transaction when
      an error happens.
                  
      Ather this patch, we always clear any error set in sql thread(it is different
      from the error in 'SHOW SLAVE STATUS') and it is cleared before rolling back
      the transaction.
      b6682591
  4. 08 Oct, 2010 14 commits
  5. 07 Oct, 2010 12 commits