1. 16 Sep, 2010 2 commits
    • Dmitry Lenev's avatar
      Fix for merge.test failures in mysql-5.5-runtime · 355b74d2
      Dmitry Lenev authored
      tree for embedded server
      
      Test case for bug #56251 "Deadlock with INSERT
      DELAYED and MERGE tables" can't be run against
      embedded server. Embedded server converts all
      DELAYED INSERTs into ordinary INSERTs and this
      test can't work properly if such conversion
      happens.
      
      Moved this test from merge.test to delayed.test
      which is skipped if test suite is run with
      --embedded-server option.
      355b74d2
    • Jon Olav Hauglid's avatar
      Bug #56595 RENAME TABLE causes assert on OS X · f14d947c
      Jon Olav Hauglid authored
      The problem was that RENAME TABLE caused an assert if the system variable
      lower_case_table_names was 2 (default on Mac OS X) and the old table name
      was given in upper case. This caused lowercase_table2.test to fail.
      
      The assert checks that an exclusive metadata lock is held by the connection
      trying to do RENAME TABLE - specificially during updates of table triggers.
      The assert was triggered since the check is case sensitive and the lock
      was held on the normalized (lower case) version of the table name.
      
      This patch fixes the problem by making sure a normalized version of the
      table name is used for the metadata lock check, while using a non-normalized
      version of the table name for the rename of trigger files. The same is done
      for ALTER TABLE ... RENAME.
      
      Regression testing for the bug itself is already covered by
      lowercase_table2.test. Additional coverage added to lowercase_fs_off.test.
      f14d947c
  2. 15 Sep, 2010 1 commit
    • Dmitry Lenev's avatar
      Fix for bug #56251 "Deadlock with INSERT DELAYED and MERGE · 6d5065a9
      Dmitry Lenev authored
      tables".
      
      Attempting to issue an INSERT DELAYED statement for a MERGE
      table might have caused a deadlock if it happened as part of
      a transaction or under LOCK TABLES, and there was a concurrent
      DDL or LOCK TABLES ... WRITE statement which tried to lock one
      of its underlying tables.
      
      The problem occurred when a delayed insert handler thread tried
      to open a MERGE table and discovered that to do this it had also
      to open all underlying tables and hence acquire metadata
      locks on them. Since metadata locks on the underlying tables were
      not pre-acquired by the connection thread executing INSERT DELAYED,
      attempts to do so might lead to waiting. In this case the
      connection thread had to wait for the delayed insert thread.
      If the thread which was preventing the lock on the underlying table
      from being acquired had to wait for the connection thread (due to
      this or other metadata locks), a deadlock occurred. 
      This deadlock was not detected by the MDL deadlock detector since 
      waiting for the handler thread by the connection thread is not
      represented in the wait-for graph.
      
      This patch solves the problem by ensuring that the delayed
      insert handler thread never tries to open underlying tables 
      of a MERGE table. Instead open_tables() is aborted right after
      the parent table is opened and a ER_DELAYED_NOT_SUPPORTED 
      error is emitted (which is passed to the connection thread and
      ultimately to the user).
      6d5065a9
  3. 13 Sep, 2010 1 commit
    • Jon Olav Hauglid's avatar
      Bug #56448 Assertion failed: ! is_set() with second xa end · 20b7be92
      Jon Olav Hauglid authored
      The problem was that issuing XA END when the XA transaction was
      already ended, caused an assertion. This assertion tests that 
      the server does not try to send OK to the client if there has
      already been an error reported. The bug was only noticeable on
      debug versions of the server.
      
      The reason for the problem was that the trans_xa_end() function
      reported success if the transaction was at XA_IDLE state at the
      end regardless of any errors occured during processing of
      trans_xa_end(). So if the transaction state was XA_IDLE already,
      reported errors would be ignored.
      
      This patch fixes the problem by having trans_xa_end() take into
      consideration any reported errors. The patch also fixes a similar
      bug with XA PREPARE.
      
      Test case added to xa.test.
      20b7be92
  4. 10 Sep, 2010 1 commit
  5. 09 Sep, 2010 7 commits
    • Marc Alff's avatar
      local merge · 712a8a2e
      Marc Alff authored
      712a8a2e
    • Dmitry Lenev's avatar
      Fix for bug #55273 "FLUSH TABLE tm WITH READ LOCK for Merge · 3326614d
      Dmitry Lenev authored
      table causes assert failure".
      
      Attempting to use FLUSH TABLE table_list WITH READ LOCK
      statement for a MERGE table led to an assertion failure if
      one of its children was not present in the list of tables
      to be flushed. The problem was not visible in non-debug builds.
      
      The assertion failure was caused by the fact that in such
      situations FLUSH TABLES table_list WITH READ LOCK implementation
      tried to use (e.g. lock) such child tables without acquiring
      metadata lock on them. This happened because when opening tables
      we assumed metadata locks on all tables were already acquired
      earlier during statement execution and a such assumption was
      false for MERGE children.
      
      This patch fixes the problem by ensuring at open_tables() time
      that we try to acquire metadata locks on all tables to be opened. 
      For normal tables such requests are satisfied instantly since
      locks are already acquired for them. For MERGE children metadata
      locks are acquired in normal fashion.
      
      Note that FLUSH TABLES merge_table WITH READ LOCK will lock for
      read both the MERGE table and its children but will flush only 
      the MERGE table. To flush children one has to mention them in table
      list explicitly. This is expected behavior and it is consistent with
      usage patterns for this statement (e.g. in mysqlhotcopy script).
      3326614d
    • Tor Didriksen's avatar
      fix typo in previous patch · 9751b77b
      Tor Didriksen authored
      9751b77b
    • Vasil Dimov's avatar
      Fix compiler warnings about unused parameters: · 71b92807
      Vasil Dimov authored
      mysys/my_sync.c: In function 'my_sync_dir':
      mysys/my_sync.c:103:29: error: unused parameter 'dir_name'
      mysys/my_sync.c:103:43: error: unused parameter 'my_flags'
      mysys/my_sync.c: In function 'my_sync_dir_by_file':
      mysys/my_sync.c:144:37: error: unused parameter 'file_name'
      mysys/my_sync.c:144:52: error: unused parameter 'my_flags'
      71b92807
    • Vasil Dimov's avatar
      Fix a compiler warning in my_gethwaddr.c:67: · 0f27e7e0
      Vasil Dimov authored
      mysys/my_gethwaddr.c: In function 'my_gethwaddr':
      mysys/my_gethwaddr.c:67:11: error: pointer targets in assignment differ in signedness
      0f27e7e0
    • Davi Arnaut's avatar
      Bug#53251: mysql_library_init fails on second execution with embedded library · 3028e734
      Davi Arnaut authored
      Add a virtual destructor. Class has virtual functions.
      3028e734
    • Evgeny Potemkin's avatar
      Auto-merged. · 89b53f99
      Evgeny Potemkin authored
      89b53f99
  6. 08 Sep, 2010 4 commits
    • Marc Alff's avatar
      Bug#56528 Increased server footprint with MTR · 92c6d9fc
      Marc Alff authored
      With recent changes in the performance schema default sizing parameters,
      the memory used by a mysqld binary increased accordingly.
      
      This negatively affects the MTR test suite,
      because running several tests in parallel now consumes more ressources.
      
      The fix is to leave the default production values unchanged,
      and to configure the MTR environment to limit memory
      used when running tests in the test suite, which is ok
      because only a few objects are typically used within a test script.
      
      This fix:
      - changed the default configuration in MTR to use less memory
      - adjusted the performance schema tests accordingly
      
      Note that 1,000 mutex instances was too short and caused test failures
      in the past in team trees, so the default used is now 10,000 in MTR.
      
      The amount of memory used by the performance schema itself
      can be observed with the statement SHOW ENGINE PERFORMANCE_SCHEMA STATUS
      92c6d9fc
    • Alexey Botchkov's avatar
      merging. · 9c1fffab
      Alexey Botchkov authored
      9c1fffab
    • Alexey Botchkov's avatar
      merging. · 406c5a17
      Alexey Botchkov authored
      406c5a17
    • Jon Olav Hauglid's avatar
      Bug #56292 Deadlock with ALTER TABLE and MERGE tables · 51a3375c
      Jon Olav Hauglid authored
      ALTER TABLE on a MERGE table could cause a deadlock with two
      other connections if we reached a situation where:
      
      1) A connection doing ALTER TABLE can't upgrade to MDL_EXCLUSIVE on the
      parent table, but holds TL_READ_NO_INSERT on the child tables.
      2) A connection doing DELETE on a child table can't get TL_WRITE on it
      since ALTER TABLE holds TL_READ_NO_INSERT.
      3) A connection doing SELECT on the parent table can't get TL_READ on 
      the child tables since TL_WRITE is ahead in the lock queue, but holds
      MDL_SHARED_READ on the parent table preventing ALTER TABLE from upgrading.
      
      For regular tables, this deadlock is avoided by having ALTER TABLE
      take a MDL_SHARED_NO_WRITE metadata lock on the table. This prevents
      DELETE from acquiring MDL_SHARED_WRITE on the table before ALTER TABLE
      tries to upgrade to MDL_EXCLUSIVE. In the example above, SELECT would
      therefore not be blocked by the pending DELETE as DELETE would not be
      able to enter TL_WRITE in the table lock queue.
      
      This patch fixes the problem for merge tables by using the same metadata
      lock type for child tables as for the parent table. The child tables will
      in this case therefore be locked with MDL_SHARED_NO_WRITE, preventing
      DELETE from acquiring a metadata lock and enter into the table lock queue.
      
      Change in behavior: By taking the same metadata lock for child tables
      as for the parent table, LOCK TABLE on the parent table will now also
      implicitly lock the child tables. Since LOCK TABLE on the parent table
      now takes more than one metadata lock, it is possible for LOCK TABLE
      ... WRITE on the parent table or child tables to give ER_LOCK_DEADLOCK
      error.
      
      Test case added to mdl_sync.test.
      Merge.test/.result has been updated to reflect the change to LOCK TABLE.
      51a3375c
  7. 07 Sep, 2010 1 commit
    • Evgeny Potemkin's avatar
      Bug#56271: Wrong comparison result with STR_TO_DATE function · e408bf4e
      Evgeny Potemkin authored
      The Item_func_str_to_date class wasn't providing correct integer DATETIME
      representation as expected. This led to wrong comparison result and didn't
      allowed the STR_TO_DATE function to be used with indexes.
      Also, STR_TO_DATE function was inconsisted on throwing warnings/errors.
      Fixed now.
      
      val_int and result_as_longlong methods were added to the Item_func_str_to_date
      class. 
      e408bf4e
  8. 06 Sep, 2010 1 commit
    • Mats Kindahl's avatar
      Bug #55966: "plugin" tests fail in 5.5 · 788d3c45
      Mats Kindahl authored
      On Solaris with version 3.4.6, the ha_example.so shared library is built
      with DTrace and the server is built without DTrace support. This occurs
      because dtrace.cmake disables DTrace support for 3.4.6, but still set
      HAVE_DTRACE, which causes probes_mysql.h to include probes_mysql_dtrace.h
      instead of probes_mysql_nodtrace.h.
      
      This patch fixes this by not setting HAVE_DTRACE on Solaris for GCC 3.4.6.
      788d3c45
  9. 03 Sep, 2010 1 commit
  10. 02 Sep, 2010 3 commits
    • Vladislav Vaintroub's avatar
      Small fixes in CMake: · 08e1a5b7
      Vladislav Vaintroub authored
       create data dir correctly in initial_database target on Windows
       handle case where INSTALL_MYSQLTESTDIR is empty (e.g someone does not want
       to install tests)
      08e1a5b7
    • Alexey Botchkov's avatar
      Bug#53251 mysql_library_init fails on second execution with embedded library · 3886c3a4
      Alexey Botchkov authored
                thread-specific variables weren't set when we load error message files.
      
      per-file comments:
        libmysqld/lib_sql.cc
      Bug#53251      mysql_library_init fails on second execution with embedded library
            we need to call my_thread_init() once more. Normally it's called at the my_init()
            stage but that doesn't happen on the second my_init() call.
      
        sql/derror.cc
      Bug#53251      mysql_library_init fails on second execution with embedded library
           use default errors for the embedded server.
      
        sql/mysqld.cc
      Bug#53251      mysql_library_init fails on second execution with embedded library
              unregister server errors in clean_up(). Without it the error list contains
              that on the second mysql_server_init() which is not good.
      
        sql/set_var.cc
      Bug#53251      mysql_library_init fails on second execution with embedded library
              sys_var::cleanup() call instead of the destructor
      
        sql/set_var.h
      Bug#53251      mysql_library_init fails on second execution with embedded library
              sys_var::cleanup() introduced instead of the destructor
              
        sql/sys_vars.h
      Bug#53251      mysql_library_init fails on second execution with embedded library
              Sys_var_charptr::cleanup() implemented
      3886c3a4
    • Marc Alff's avatar
      Bug#55873 short startup options do not work in 5.5 · b9e063ca
      Marc Alff authored
      Merge cleanup, fixed a build warning:
      
      my_getopt.c:156: warning: 'opt_found' may be used uninitialized in this function
      b9e063ca
  11. 01 Sep, 2010 6 commits
  12. 31 Aug, 2010 10 commits
    • Alexander Nozdrin's avatar
      b75958e6
    • Alexander Nozdrin's avatar
      Bug#55980 Character sets: supplementary character _bin ordering is wrong · 8da22a75
      Alexander Nozdrin authored
      Problem:
      - ORDER BY for utf8mb4_bin, utf16_bin and utf32_bin returned
        results in a wrong order, because old functions
        (supporting only BMP range) were used to handle these collations.
      - Additionally, utf16_bin did not sort supplementary characters
        between U+D700 and U+E000, as WL#1213 specification specified.
      8da22a75
    • Alexander Nozdrin's avatar
      Bug#27480 (Extend CREATE TEMPORARY TABLES privilege · d2159e37
      Alexander Nozdrin authored
      to allow temp table operations) -- prerequisite patch #3.
      
      Rename open_temporary_table() to open_table_uncached().
      open_temporary_table() will be introduced in following patches
      to open temporary tables for a statement.
      d2159e37
    • Alexander Nozdrin's avatar
      Remove check_merge_table_access(). · 53e566a4
      Alexander Nozdrin authored
      check_merge_table_access() used to do two things:
        - set proper database for every merge table child;
        - check SELECT | UPDATE | DELETE for merge table children.
      
      Setting database is not needed anymore, since it's done
      on the parsing stage.
      
      Thus, check_merge_table_access() can be removed;
      needed privileges can be checked using check_table_access().
      53e566a4
    • Alexander Nozdrin's avatar
      Polish check_grant(): name TABLE_LIST instance "tl", not "table". · 6b9371bd
      Alexander Nozdrin authored
      This allows to avoid mixing it up with pointer to TABLE object
      which will be introduced to this function in one of upcoming
      patches.
      6b9371bd
    • Alexander Nozdrin's avatar
      Remove unused enum (enum open_table_mode). · 1f1eba3c
      Alexander Nozdrin authored
      It was added by mistake during backport from 6.0.
      1f1eba3c
    • Alexander Nozdrin's avatar
      Bug#27480 (Extend CREATE TEMPORARY TABLES privilege · 2e462c8f
      Alexander Nozdrin authored
      to allow temp table operations) -- prerequisite patch #2.
      
      Introduce a new form of find_temporary_table() function:
      find_temporary_table() by a table key. It will be used
      in further patches.
      
      Replace find_temporary_table(table_list->db, table_list->name)
      by more appropiate find_temporary_table(table_list) across
      the codebase.
      2e462c8f
    • Alexander Nozdrin's avatar
      Fix TABLE::init() comment. · a92ca267
      Alexander Nozdrin authored
      a92ca267
    • Dmitry Lenev's avatar
      Bug #56137 "Assertion `thd->lock == 0' failed on upgrading · 26bc3b34
      Dmitry Lenev authored
      from 5.1.50 to 5.5.6".
      
      Debug builds of the server aborted due to an assertion
      failure when DROP DATABASE statement was run on an
      installation which had outdated or corrupt mysql.proc table.
      Particularly this affected the mysql_upgrade tool which is
      run as part of 5.1 to 5.5 upgrade.
      
      The problem was that sp_drop_db_routines(), which was invoked
      during dropping of the database, could have returned without
      closing and unlocking mysql.proc table in cases when this
      table was not up-to-date with the current server. As a result
      further attempt to open and lock the mysql.event table, which
      was necessary to complete dropping of the database, ended up
      with an assert.
      
      This patch solves this problem by ensuring that
      sp_drop_db_routines() always closes mysql.proc table and
      releases metadata locks on it. This is achieved by changing
      open_proc_table_for_update() function to close tables and
      release metadata locks acquired by it in case of failure.
      This step also makes behavior of the latter function
      consistent with behavior of open_proc_table_for_read()/
      open_and_lock_tables().
      
      
      Test case for this bug was added to sp-destruct.test.
      26bc3b34
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.5-merge. · e4a7db6c
      Alexander Nozdrin authored
      e4a7db6c
  13. 30 Aug, 2010 2 commits