1. 04 Oct, 2010 11 commits
    • Vladislav Vaintroub's avatar
      merge · 67689a43
      Vladislav Vaintroub authored
      67689a43
    • Vladislav Vaintroub's avatar
      merge2 · fdf64cec
      Vladislav Vaintroub authored
      fdf64cec
    • Vasil Dimov's avatar
      Merge mysql-5.1-bugteam -> mysql-5.5-bugteam · eb1be01f
      Vasil Dimov authored
      (null merge of innodb-only changes)
      eb1be01f
    • Vasil Dimov's avatar
      Merge mysql-5.1-innodb -> mysql-5.1-bugteam · 2f6dd4b8
      Vasil Dimov authored
      2f6dd4b8
    • Vladislav Vaintroub's avatar
      A follow-up to the patch for bug #56405 "Deadlock in the MDL deadlock · abae881f
      Vladislav Vaintroub authored
      detector". This patch addresses performance regression in OLTP_RO/MyISAM
      test on Windows introduced by the fix for bug #56405. Thus it makes
      original patch acceptable as a solution for bug #56585 "Slowdown of
      readonly sysbench benchmarks (e.g point_select) on Windows 5.5".
      
      With this patch, MySQL will use native Windows condition variables and 
      reader-writer locks  if  they are supported by the OS.
      
      This speeds up MyISAM and the effect comes mostly from using native
      rwlocks. Native conditions improve scalability with higher number of 
      concurrent users in other situations, e.g for prlocks.
      
      Benchmark numbers for this patch as measured on Win2008R2 quad
      core machine are attached to the bug report.
      ( direct link http://bugs.mysql.com/file.php?id=15883 )
      
      Note that currently we require at least Windows7/WS2008R2 for 
      reader-writer locks, even though native rwlock is available also on Vista.
      Reason is that "trylock" APIs are missing on Vista, and trylock is used in
      the server (in a single place in query cache).
      
      While this patch could have been written differently, to enable the native
      rwlock optimization also on Vista/WS2008 (e.g using native locks everywhere
      but portable implementation in query cache), this would come at the 
      expense of the code clarity, as it would introduce a new  "try-able" rwlock
      type, to handle Vista case.
      
      Another way to improve performance for the special case 
      (OLTP_RO/MYISAM/Vista) would be to eliminate "trylock" usage from server,
       but this is outside of the scope here.
      
      
      Native conditions variables are used beginning with Vista though the effect
      of using condition variables alone is not measurable in this benchmark.
      But when used together with native rwlocks on Win7, native conditions improve 
      performance in high-concurrency OLTP_RO/MyISAM (128 and more sysbench 
      users).
      abae881f
    • Bjorn Munch's avatar
      null upmerge · 0fbe6cbd
      Bjorn Munch authored
      0fbe6cbd
    • Marko Mäkelä's avatar
      Bug#56716 InnoDB locks a record gap without locking the table · a0762fa5
      Marko Mäkelä authored
      row_search_for_mysql(): Acquire an intention lock on the table
      before locking the first record gap.
      a0762fa5
    • Marko Mäkelä's avatar
      Bug#56716 InnoDB locks a record gap without locking the table · e9317ac6
      Marko Mäkelä authored
      row_search_for_mysql(): Acquire an intention lock on the table
      before locking the first record gap.
      e9317ac6
    • Bjorn Munch's avatar
    • Vasil Dimov's avatar
      Merge mysql-5.1-bugteam -> mysql-5.1-innodb · 85e8c0cc
      Vasil Dimov authored
      85e8c0cc
    • Bjorn Munch's avatar
      merge from 5.5-mtr · 79883a96
      Bjorn Munch authored
      79883a96
  2. 03 Oct, 2010 2 commits
  3. 02 Oct, 2010 2 commits
  4. 01 Oct, 2010 25 commits
    • Alexey Kopytov's avatar
      Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam. · 3ec78a94
      Alexey Kopytov authored
      conflicts:
         conflict      dbug/dbug.c
         conflict      sql/sql_load.cc
      3ec78a94
    • Alexey Kopytov's avatar
      Automerge. · e7031816
      Alexey Kopytov authored
      e7031816
    • Mattias Jonsson's avatar
    • Mattias Jonsson's avatar
      merge · 51aec045
      Mattias Jonsson authored
      51aec045
    • Mattias Jonsson's avatar
      merge · cb21cd3b
      Mattias Jonsson authored
      cb21cd3b
    • Mattias Jonsson's avatar
      merge · 43450523
      Mattias Jonsson authored
      43450523
    • Mattias Jonsson's avatar
      minor test result update after merge · f57db884
      Mattias Jonsson authored
      f57db884
    • Mattias Jonsson's avatar
      merge · 08374099
      Mattias Jonsson authored
      08374099
    • Mattias Jonsson's avatar
      Manual merge into mysql-5.5-bugteam · b3cd76d5
      Mattias Jonsson authored
      b3cd76d5
    • Bjorn Munch's avatar
      upmerge 20304 · fbdc6313
      Bjorn Munch authored
      fbdc6313
    • Mattias Jonsson's avatar
      merge · a250cc89
      Mattias Jonsson authored
      a250cc89
    • Vasil Dimov's avatar
      Merge mysql-5.5-innodb -> mysql-5.5-bugteam · b2482843
      Vasil Dimov authored
      b2482843
    • Mattias Jonsson's avatar
      merge · c1909bcf
      Mattias Jonsson authored
      c1909bcf
    • Mattias Jonsson's avatar
      5b2bbd18
    • Mattias Jonsson's avatar
      merge · d51b0325
      Mattias Jonsson authored
      d51b0325
    • Vasil Dimov's avatar
      Null merge mysql-5.1-bugteam -> mysql-5.5-bugteam · 51f26939
      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.
      51f26939
    • Vasil Dimov's avatar
      Merge mysql-5.1-innodb -> mysql-5.1-bugteam · b74a1ff2
      Vasil Dimov authored
      b74a1ff2
    • Mattias Jonsson's avatar
    • Vasil Dimov's avatar
      Fix a potential bug when using __sync_lock_test_and_set() · 1968714c
      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)
      1968714c
    • Mattias Jonsson's avatar
      merge · 4ef9195e
      Mattias Jonsson authored
      4ef9195e
    • Mattias Jonsson's avatar
      Bug#51851: Server with SBR locks mutex twice on · 59dd4888
      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+.
      59dd4888
    • Mattias Jonsson's avatar
      Bug#56172: Server crashes in ha_partition::reset on · 4d44095a
      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.
      4d44095a
    • Jon Olav Hauglid's avatar
      b7acb88c
    • Bjorn Munch's avatar
      Bug #20304 mysqltest: reap with no preceding statement hangs forever · 508ffaf0
      Bjorn Munch authored
      Added sanity check, similar to the one preventing send without reap
      508ffaf0
    • Bernt M. Johnsen's avatar
      Merge · 01a3e1f2
      Bernt M. Johnsen authored
      01a3e1f2