1. 04 Oct, 2010 12 commits
  2. 03 Oct, 2010 2 commits
  3. 02 Oct, 2010 2 commits
  4. 01 Oct, 2010 24 commits
    • Alexey Kopytov's avatar
      Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam. · d72c5947
      Alexey Kopytov authored
      conflicts:
         conflict      dbug/dbug.c
         conflict      sql/sql_load.cc
      d72c5947
    • Alexey Kopytov's avatar
      Automerge. · 00677a80
      Alexey Kopytov authored
      00677a80
    • Mattias Jonsson's avatar
    • Mattias Jonsson's avatar
      merge · de54fc65
      Mattias Jonsson authored
      de54fc65
    • Mattias Jonsson's avatar
      merge · 38627075
      Mattias Jonsson authored
      38627075
    • Mattias Jonsson's avatar
      merge · 36e0ca0d
      Mattias Jonsson authored
      36e0ca0d
    • Mattias Jonsson's avatar
      minor test result update after merge · 29acd776
      Mattias Jonsson authored
      29acd776
    • Mattias Jonsson's avatar
      merge · ed4424a8
      Mattias Jonsson authored
      ed4424a8
    • Mattias Jonsson's avatar
      Manual merge into mysql-5.5-bugteam · 20606cec
      Mattias Jonsson authored
      20606cec
    • Bjorn Munch's avatar
      upmerge 20304 · ad1824ee
      Bjorn Munch authored
      ad1824ee
    • Mattias Jonsson's avatar
      merge · 3c555b6c
      Mattias Jonsson authored
      3c555b6c
    • Vasil Dimov's avatar
      Merge mysql-5.5-innodb -> mysql-5.5-bugteam · 1f1c2e22
      Vasil Dimov authored
      1f1c2e22
    • Mattias Jonsson's avatar
      merge · fbb49d80
      Mattias Jonsson authored
      fbb49d80
    • Mattias Jonsson's avatar
      53fe2b31
    • Mattias Jonsson's avatar
      merge · 9aa7484c
      Mattias Jonsson authored
      9aa7484c
    • Vasil Dimov's avatar
      Null merge mysql-5.1-bugteam -> mysql-5.5-bugteam · ddc653be
      Vasil Dimov authored
      This is a null merge because it only contains InnoDB changes that
      originated in mysql-5.1-innodb and have been manually ported into
      mysql-5.5-innodb.
      ddc653be
    • Vasil Dimov's avatar
      Merge mysql-5.1-innodb -> mysql-5.1-bugteam · 4a9b4ed0
      Vasil Dimov authored
      4a9b4ed0
    • Mattias Jonsson's avatar
    • Vasil Dimov's avatar
      Fix a potential bug when using __sync_lock_test_and_set() · 75fc5b6a
      Vasil Dimov authored
      This is a manual merge from mysql-5.1-innodb of:
      
        revision-id: vasil.dimov@oracle.com-20100930102618-s9f9ytbytr3eqw9h
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        timestamp: Thu 2010-09-30 13:26:18 +0300
        message:
          Fix a potential bug when using __sync_lock_test_and_set()
      
          TYPE __sync_lock_test_and_set (TYPE *ptr, TYPE value, ...)
      
          it is not documented what happens if the two arguments are of different
          type like it was before: the first one was lock_word_t (byte) and the
          second one was 1 or 0 (int).
      
          Approved by:	Marko (via IRC)
      75fc5b6a
    • Mattias Jonsson's avatar
      merge · cfcf51b7
      Mattias Jonsson authored
      cfcf51b7
    • Mattias Jonsson's avatar
      Bug#51851: Server with SBR locks mutex twice on · 814fbc5b
      Mattias Jonsson authored
      LOAD DATA into partitioned MyISAM table
      
      Problem was that both partitioning and myisam
      used the same table_share->mutex for different protections
      (auto inc and repair).
      
      Solved by adding a specific mutex for the partitioning
      auto_increment.
      
      Also adding destroying the ha_data structure in
      free_table_share (which is to be propagated
      into 5.5).
      
      This is a 5.1 ONLY patch, already fixed in 5.5+.
      814fbc5b
    • Mattias Jonsson's avatar
      Bug#56172: Server crashes in ha_partition::reset on · 1b5f84db
      Mattias Jonsson authored
                 REBUILD PARTITION under LOCK TABLE
      
      Collapsed patch including updates from the reviews.
      
      In case of failure in ALTER ... PARTITION under LOCK TABLE
      the server could crash, due to it had modified the locked
      table object, which was not reverted in case of failure,
      resulting in a bad table definition used after the failed
      command.
      
      Solved by instead of altering the locked table object and
      its partition_info struct, creating an internal temporary
      intermediate table object used for altering,
      just like the non partitioned mysql_alter_table.
      So if an error occur before the alter operation is complete,
      the original table is not modified at all.
      But if the alter operation have succeeded so far that it
      must be completed as whole,
      the table is properly closed and reopened.
      (The completion on failure is done by the ddl_log.)
      
      mysql-test/suite/parts/inc/partition_fail.inc:
        Added tests under LOCK TABLE
      mysql-test/suite/parts/r/partition_debug_innodb.result:
        Updated results
      mysql-test/suite/parts/r/partition_debug_myisam.result:
        Updated results
      mysql-test/suite/parts/r/partition_special_innodb.result:
        updated result
      mysql-test/suite/parts/t/partition_special_innodb.test:
        changing comment, since this patch also fixes this.
      sql/sql_partition.cc:
        Added TODO, to use DBUG_SUICIDE() instead of abort()
        to avoid core-files on expected crashes.
        Removed unused arguments to fast_end_partition.
        Opening a intermediate table in prep_alter_part_table, instead of altering
        (a possible locked) normally opened table.
        That way we do not have to do anything more than close
        the intermediate table on error,
        leaving the ordinary table opened and locked.
        Also making sure that the intermediate table are
        closed/destroyed on failure. If no error occur
        it is later destroyed in the end of fast_alter_partition_table.
        Added ha_external_lock to make sure MyISAM flushed the index file
        after copying the partitions.
        This also leads to removal of the special close and removal from
        the table cache for other instances of the table.
      sql/sql_partition.h:
        Changed the arguments for prep_alter_part_table and
        fast_alter_partition_table to use an intermediate table
        instead of altering a (possibly locked) normal table.
      sql/sql_table.cc:
        Using an intermediate table created in prep_alter_part_table
        to be used in fast_alter_partition_table, also closing/destroying
        it on failure.
      1b5f84db
    • Jon Olav Hauglid's avatar
      029657be
    • Bjorn Munch's avatar
      Bug #20304 mysqltest: reap with no preceding statement hangs forever · abaa5c91
      Bjorn Munch authored
      Added sanity check, similar to the one preventing send without reap
      abaa5c91