1. 24 Feb, 2012 8 commits
  2. 23 Feb, 2012 3 commits
    • Michael Widenius's avatar
      Automatic merge · 6e1dac8f
      Michael Widenius authored
      6e1dac8f
    • Michael Widenius's avatar
      Fixes for make_binary_distribution and mysql_config for OpenSuse 12.1 · d395d251
      Michael Widenius authored
      
      BUILD/SETUP.sh:
        By default, build also with innodb-plugin
      mysql-test/mysql-test-run.pl:
        Also search in lib64 directory for plugins (This is used at least on OpenSuse 12.1 when using default build scripts)
      mysql-test/r/lock_multi.result:
        Allow test to be re-run even if it crashed.
      mysql-test/t/lock_multi.test:
        Allow test to be re-run even if it crashed.
      scripts/make_binary_distribution.sh:
        Ensure that libexecdir is named libexec (was not on OpenSuse 12.1)
      scripts/mysql_config.sh:
        Fixed detection of lib64 was used.
      d395d251
    • Michael Widenius's avatar
      Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_open_tables_state. · 2b625ac3
      Michael Widenius authored
      This also fixes a (not likely) crashing bug when forcing a thread that was doing a table lock to re-open it's files, for example by creating a trigger.
      
      
      mysys/thr_lock.c:
        Added more checking to find wrong locks.
        Removed one, not needed, parameter to thr_lock
      sql/lock.cc:
        Fixed mysql_lock_tables() to retry with new sql_lock if lock fails. This was needed as table may be closed and reopened between retry's and then the old sql_lock will point to stale data.
      sql/mysql_priv.h:
        Updated prototype
      sql/sql_base.cc:
        Ensure that all tables are closed if opening of system table failes; This fixes the assert in THD::restore_backup_open_tables_state
      sql/sql_handler.cc:
        Updated variable type
      2b625ac3
  3. 22 Feb, 2012 5 commits
  4. 21 Feb, 2012 6 commits
  5. 20 Feb, 2012 6 commits
  6. 21 Feb, 2012 3 commits
  7. 20 Feb, 2012 9 commits