1. 26 Jun, 2010 3 commits
    • Jon Olav Hauglid's avatar
      null-merge from mysql-5.1-bugteam. · f8f7a704
      Jon Olav Hauglid authored
      f8f7a704
    • Jon Olav Hauglid's avatar
      Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE with open HANDLER · 9fa66b64
      Jon Olav Hauglid authored
      This deadlock happened if DROP DATABASE was blocked due to an open
      HANDLER table from a different connection. While DROP DATABASE
      is blocked, it holds the LOCK_mysql_create_db mutex. This results
      in a deadlock if the connection with the open HANDLER table tries
      to execute a CREATE/ALTER/DROP DATABASE statement as they all
      try to acquire LOCK_mysql_create_db.
      
      This patch makes this deadlock scenario very unlikely by closing and
      marking for re-open all HANDLER tables for which there are pending
      conflicing locks, before LOCK_mysql_create_db is acquired.
      However, there is still a very slight possibility that a connection
      could access one of these HANDLER tables between closing/marking for
      re-open and the acquisition of LOCK_mysql_create_db.
      
      This patch is for 5.1 only, a separate and complete fix will be
      made for 5.5+.
      
      Test case added to schema.test.
      9fa66b64
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk. · 78413326
      Alexander Nozdrin authored
      78413326
  2. 25 Jun, 2010 4 commits
  3. 24 Jun, 2010 13 commits
  4. 23 Jun, 2010 2 commits
  5. 22 Jun, 2010 4 commits
    • Alexey Kopytov's avatar
      Bug#54477: Crash on IN / CASE with NULL arguments · 07e95b39
      Alexey Kopytov authored
      Incorrect handling of NULL arguments could lead to a crash on
      the IN or CASE operations when either NULL arguments were
      passed explicitly as arguments (IN) or implicitly generated by
      the WITH ROLLUP modifier (both IN and CASE).
      
      Item_func_case::find_item() assumed all necessary comparators
      to be instantiated in fix_length_and_dec(). However, in the
      presence of WITH ROLLUP modifier, arguments could be
      substituted with an Item_null leading to an "unexpected"
      STRING_RESULT comparator being invoked.
      
      In addition to the problem identical to the above,
      Item_func_in::val_int() could crash even with explicitly passed
      NULL arguments due to an optimization in fix_length_and_dec()
      leading to NULL arguments being ignored during comparators
      creation.
      07e95b39
    • Vasil Dimov's avatar
      Merge mysql-trunk -> mysql-trunk-merge · 149d3054
      Vasil Dimov authored
      149d3054
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-bugfixing. · 13495fae
      Alexander Nozdrin authored
      13495fae
    • Magne Mahre's avatar
      Post-push fixups for WL#5349 · b4f77c40
      Magne Mahre authored
      b4f77c40
  6. 21 Jun, 2010 6 commits
  7. 20 Jun, 2010 1 commit
    • Magne Mahre's avatar
      Post-push fixup for WL#5349 · eda2ff81
      Magne Mahre authored
      InnoDB came in a new version "simultanously" with the
      commit.  This patch is a minor change to the new innodb
      regression test suite. 
      eda2ff81
  8. 19 Jun, 2010 1 commit
  9. 18 Jun, 2010 3 commits
  10. 17 Jun, 2010 3 commits
    • Magne Mahre's avatar
      WL#5349 Change default storage engine to InnoDB · 3ac6a4b4
      Magne Mahre authored
      The default storage engine is changed from MyISAM to
      InnoDB, in all builds except for the embedded server.
      
      In addition, the following system variables are 
      changed:
      
        * innodb_file_per_table is enabled
        * innodb_strict_mode is enabled
        * innodb_file_format_name_update is changed
          to 'Barracuda'
      
      The test suite is changed so that tests that do not
      explicitly include the have_innodb.inc are run with
      --default-storage-engine=MyISAM.  This is to ease the
      transition, so that most regression tests are run
      with the same engine as before.
      
      Some tests are disabled for the embedded server
      regression test, as the output of certain statements
      will be different that for the regular server
      (i.e SELECT @@default_storage_engine).  This is to
      ease transition.
      3ac6a4b4
    • Joerg Bruehe's avatar
      Bug#54590 "make_binary_distribution" fails because a command · 81fda234
      Joerg Bruehe authored
      line exceeds the limit
      
      Merge the fix into "trunk-bugfixing".
      81fda234
    • Joerg Bruehe's avatar
      Bug#54590 "make_binary_distribution" fails because a command · e740b826
      Joerg Bruehe authored
      line exceeds the limit
      
      Upmerge the fix from 5.1 to 5.5 ("trunk").
      e740b826