1. 19 Apr, 2010 1 commit
  2. 15 Apr, 2010 3 commits
    • Jon Olav Hauglid's avatar
      Bug #47459 Assertion in Diagnostics_area::set_eof_status on OPTIMIZE TABLE · c782dd58
      Jon Olav Hauglid authored
      This assertion could be triggered during execution of OPTIMIZE TABLE for
      InnoDB tables. As part of optimize for InnoDB tables, the table is recreated
      and then opened again. If the reopen failed for any reason, the assertion
      would be triggered. This could for example be caused by a concurrent DROP
      TABLE executed by a different connection. The reason for the assertion was
      that any failures during reopening were ignored.
      
      This patch fixes the problem by making sure that the result of reopening the
      table is checked and that any error messages are sent to the client.
      
      Test case added to innodb_mysql_sync.test.
      c782dd58
    • Jon Olav Hauglid's avatar
      Bug #51391 Deadlock involving events during rqg_info_schema test · 1a20fadc
      Jon Olav Hauglid authored
      This was a deadlock between CREATE/ALTER/DROP EVENT and a query
      accessing both the mysql.event table and I_S.GLOBAL_VARIABLES.
      
      The root of the problem was that the LOCK_event_metadata mutex was
      used to both protect the "event_scheduler" global system variable
      and the internal event data structures used by CREATE/ALTER/DROP EVENT.
      
      The deadlock would occur if CREATE/ALTER/DROP EVENT held
      LOCK_event_metadata while trying to open the mysql.event table,
      at the same time as the query had mysql.event open, trying to
      lock LOCK_event_metadata to access "event_scheduler".
      
      This bug was fixed in the scope of Bug#51160 by using only
      LOCK_global_system_variables to protect "event_scheduler".
      This makes it so that the query above won't lock LOCK_event_metadata,
      thereby preventing this deadlock from occuring.
      
      This patch contains no code changes.
      Test case added to lock_sync.test.
      1a20fadc
    • Jon Olav Hauglid's avatar
      Bug #51327 MyISAM table is automatically repaired on ALTER · 4f7ccd5c
      Jon Olav Hauglid authored
                 even if myisam-recover is OFF
      
      The problem was that a corrupted MyISAM table was auto repaired
      even if the myisam_recover_options server variable (or the 
      myisam_recover option) was set to OFF.
      
      The reason was that the auto_repair() function, which is supposed
      to say if auto repair is to be used, did not use the server variable
      setting correctly. This bug was a regression introduced by WL#4738.
      
      This patch fixes the problem by making sure auto_repair() returns
      FALSE if myisam_recover_options is set to OFF.
      
      Test case added to myisam.test.
      4f7ccd5c
  3. 14 Apr, 2010 2 commits
    • Jon Olav Hauglid's avatar
      Bug #52593 SHOW CREATE TABLE is blocked if table is locked · abba01f6
      Jon Olav Hauglid authored
                 for write by another connection
      
      The problem was that if a table was locked in one connection by
      LOCK TABLES ... WRITE, REPAIR TABLE or OPTIMIZE TABLE, SHOW CREATE
      TABLE from another connection would be blocked. As SHOW CREATE TABLE
      only reads metadata about the table, such blocking is not needed.
      
      The problem was that when SHOW CREATE TABLE tried to get a metadata
      lock on the table in order to open it, it used the wrong type of
      metadata lock request. It used MDL_SHARED_READ which is used when
      the intent is to read both table metadata and table data. Instead
      it should have used MDL_SHARED_HIGH_PRIO which signifies an intent
      to only read metadata.
      
      This patch fixes the problem by making sure SHOW CREATE TABLE uses
      the MDL_SHARED_HIGH_PRIO metadata lock request type when trying to
      open the table. The patch also fixes a similar problem with the
      mysql_list_fields API call.
      
      Test case added to show_check.test.
      abba01f6
    • Jon Olav Hauglid's avatar
      Bug #52367 Deadlock involving SET GLOBAL EVENT_SCHEDULER = OFF · 22a1cc8a
      Jon Olav Hauglid authored
                 during rqg_mdl_deadlock test
      
      The problem was that if two connection threads simultaneously tries
      to execute "SET GLOBAL EVENT_SCHEDULER = OFF", one of them could
      hang waiting for the scheduler to stop.
      
      The first connection thread would kill the event scheduler thread
      and then start waiting for it to exit. The second connection thread
      would then find the event scheduler thread in the process of exiting
      and also wait for it to exit. However, since the event scheduler 
      thread used signal to wake only one waiting thread, the other connection
      thread would be left waiting.
      
      This bug was a regression introduced by the fix for Bug#51160.
      Before #51160 it was not possible for two connection threads to 
      try to stop the event scheduler thread simultaneously.
      
      This patch fixes the problem my making sure the event scheduler
      thread uses broadcast to notify all waiters that it is exiting.
      
      No test case added as this would require adding debug sync points
      to parts of the code where sync points are currently not used.
      The patch has been tested with the non-deterministic test case
      from the bug description as well as using the RQG.
      22a1cc8a
  4. 17 Mar, 2010 2 commits
    • Davi Arnaut's avatar
      Rename tree. · 8289939f
      Davi Arnaut authored
      8289939f
    • Davi Arnaut's avatar
      Fix assorted compiler warnings. · d72ccba9
      Davi Arnaut authored
      sql/handler.cc:
        Initialize the "comment" member of the structure.
      sql/sql_base.cc:
        Compile out unused function.
      sql/sql_update.cc:
        Remove unused variable.
      sql/sys_vars.cc:
        Use correct format specifier.
      d72ccba9
  5. 16 Mar, 2010 1 commit
  6. 15 Mar, 2010 11 commits
    • Mats Kindahl's avatar
      Merging with mysql-trunk-bugfixing · 06fc79d7
      Mats Kindahl authored
      06fc79d7
    • Mats Kindahl's avatar
      Merging with mysql-trunk-bugfixing · 13db463a
      Mats Kindahl authored
      13db463a
    • Konstantin Osipov's avatar
      A post-review fix for type-aware metadata locks. · c0512fac
      Konstantin Osipov authored
      DDL no longer aborts mysql_lock_tables(), and hence
      we no longer need to support need_reopen flag of this
      call. 
      Remove the flag, and all the code in the server
      that was responsible for handling the case when
      it was set. This allowed to simplify: 
      open_and_lock_tables_derived(), the delayed thread,
      multi-update.
      
      Rename MYSQL_LOCK_IGNORE_FLUSH to MYSQL_OPEN_IGNORE_FLUSH,
      since we now only support this flag in open_table().
      
      Rename MYSQL_LOCK_PERF_SCHEMA to MYSQL_LOCK_LOG_TABLE,
      to avoid confusion.
      
      Move the wait for the global read lock for cases
      when we do updates in SELECT f1() or DO (UPDATE) to 
      open_table() from mysql_lock_tables(). When waiting
      for the read lock, we could raise need_reopen flag,
      which is no longer present in mysql_lock_tables().
      Since the block responsible for waiting for GRL
      was moved, MYSQL_LOCK_IGNORE_GLOBAL_READ_LOCK
      was renamed to MYSQL_OPEN_IGNORE_GLOBAL_READ_LOCK.
      
      
      mysql-test/r/mdl_sync.result:
        Update test results (see comments for mdl_sync.test).
      mysql-test/t/mdl_sync.test:
        Update tests: an abort mysql_lock_tables() called for an
        INSERT no longer auto-closes SQL HANDLERS, since it
        no longer leads to back-off and retry.
      sql/ha_ndbcluster_binlog.cc:
        Remove unused variables.
      sql/lock.cc:
        Remove support for need_reopen parameter of mysql_lock_tables().
        Update comments.
      sql/log_event_old.cc:
        Remove the loop responsible for handling need_reopen
        out parameter of mysql_lock_tables().
      sql/mysql_priv.h:
        Update open and lock tables flag names.
      sql/share/errmsg-utf8.txt:
        Add a new error message to report when
        thr_multi_lock() is aborted.
      sql/sql_base.cc:
        Update comments. Rename MYSQL_LOCK_IGNORE_FLUSH
        to MYSQL_OPEN_IGNORE_FLUSH.
      sql/sql_class.h:
        Remove unused code.
      sql/sql_db.cc:
        Remove an unused bit of code.
      sql/sql_handler.cc:
        For backward compatibility, we still want to back off and
        retry when a call to mysql_lock_tables() is aborted
        from within an SQL HANDLER. Write an internal error
        handler to support the case.
      sql/sql_insert.cc:
        Call mysql_lock_tables() no longer has need_reopen
        out parameter. Simplify the code by removing 
        the crud that took care of it.
        MYSQL_LOCK_IGNORE_FLUSH is now only supported by
        open_tables().
      sql/sql_show.cc:
        Rename MYSQL_LOCK_IGNORE_FLUSH to MYSQL_OPEN_IGNORE_FLUSH
      sql/sql_table.cc:
        Remove an unused parameter.
      sql/sql_update.cc:
        Remove the need_reopen loop from multi-update.
        We no also longer need to cleanup the parse tree in case
        when mysql_lock_tables() is aborted and thus an infinite
        source of multi-update bugs is gone.
      sql/tztime.cc:
        Rename MYSQL_LOCK_IGNORE_FLUSH to MYSQL_OPEN_IGNORE_FLUSH,
        since from now on this flag is only supported by open_table().
      c0512fac
    • Vladislav Vaintroub's avatar
      merge · 9e89385d
      Vladislav Vaintroub authored
      9e89385d
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk. · 9a29e6d1
      Alexander Nozdrin authored
      9a29e6d1
    • Alexander Nozdrin's avatar
      A patch for Bug#52071 (rpl_ndb.rpl_ndb_ctype_ucs2_def fails). · 3c21280b
      Alexander Nozdrin authored
      Use new command line options instead of deprecated and removed ones.
      3c21280b
    • Alexander Nozdrin's avatar
      3143bc9c
    • Magnus Blåudd's avatar
      Merge · 465637d4
      Magnus Blåudd authored
      465637d4
    • Magnus Blåudd's avatar
      Merge in fix for bug#42589 · c2a15cc3
      Magnus Blåudd authored
      c2a15cc3
    • Jon Olav Hauglid's avatar
      Bug #51160 Deadlock around SET GLOBAL EVENT_SCHEDULER = ON|OFF · 7a69d82f
      Jon Olav Hauglid authored
      This deadlock could occour betweeen one connection executing
      SET GLOBAL EVENT_SCHEDULER= ON and another executing SET GLOBAL
      EVENT_SCHEDULER= OFF. The bug was introduced by WL#4738.
      
      The first connection would hold LOCK_event_metadata (protecting
      the global variable) while trying to lock LOCK_global_system_variables
      starting the event scheduler thread (in THD:init()).
      
      The second connection would hold LOCK_global_system_variables
      while trying to get LOCK_event_scheduler after stopping the event
      scheduler inside event_scheduler_update().
      
      This patch fixes the problem by not using LOCK_event_metadata to
      protect the event_scheduler variable. It is still protected using
      LOCK_global_system_variables. This fixes the deadlock as it removes 
      one of the two mutexes used to produce it.
      
      However, this patch opens up the possibility that the event_scheduler
      variable and the real event_scheduler state can become out of sync
      (e.g. variable = OFF, but scheduler running). But this can only
      happen under very unlikely conditions - two concurrent SET GLOBAL
      statments, with one thread interrupted at the exact wrong moment.
      This is preferable to having the possibility of a deadlock.
      
      This patch also fixes a bug where it was possible to exit create_event()
      without releasing LOCK_event_metadata if running out of memory during
      its exection.
      
      No test case added since a repeatable test case would have required
      excessive use of new sync points. Instead we rely on the fact that
      this bug was easily reproduceable using RGQ tests.
      7a69d82f
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk. · f73ca78c
      Alexander Nozdrin authored
      f73ca78c
  7. 14 Mar, 2010 1 commit
    • Mats Kindahl's avatar
      Bug #51938 plugin_dir gets bad default value · eef715c9
      Mats Kindahl authored
      When building the script directory using a CMake-based build, both the
      variables in config.h.cmake (including PLUGINDIR) and the variables in
      CMakeList.txt (which includes pkgplugindir).
      
      However, for autotools-based builds, only pkgplugindir is substituted,
      which means that the plugin-path is not substituted.
      
      This patch solves the problem by using pkgplugindir, which works on both
      CMake-based and autotools-based builds, instead of PLUGINDIR.
      eef715c9
  8. 13 Mar, 2010 1 commit
  9. 12 Mar, 2010 8 commits
  10. 11 Mar, 2010 8 commits
  11. 10 Mar, 2010 2 commits