1. 14 Oct, 2010 2 commits
    • Konstantin Osipov's avatar
      A fix and a test case for Bug#56540 "Exception (crash) in · 59e27d92
      Konstantin Osipov authored
      sql_show.cc during rqg_info_schema test on Windows".
      
      Ensure we do not access freed memory when filling
      information_schema.views when one of the views
      could not be properly opened.
      
      
      
      mysql-test/r/information_schema.result:
        Update results - a fix for Bug#56540.
      mysql-test/t/information_schema.test:
        Add a test case for Bug#56540
      sql/sql_base.cc:
        Push an error into the Diagnostics area
        when we return an error.
        This directs get_all_tables() to the execution
        branch which doesn't involve 'process_table()'
        when no table/view was opened.
      sql/sql_show.cc:
        Do not try to access underlying table fields
        when opening of a view failed. The underlying
        table is closed in that case, and accessing
        its fields may lead to dereferencing a damaged 
        pointer.
      59e27d92
    • Jon Olav Hauglid's avatar
      Follow-up for Bug #55930 Assertion `thd->transaction.stmt.is_empty() · 5c95e286
      Jon Olav Hauglid authored
                               || thd->in_sub_stmt || (thd->state..
      
      Don't rollback statement transactions if we are in a sub-statement.
      This could for example happen for open_ltable() when opening the
      general log during execution of a stored procedure.
      5c95e286
  2. 13 Oct, 2010 3 commits
    • Jon Olav Hauglid's avatar
      Bug #55930 Assertion `thd->transaction.stmt.is_empty() || · 1d35c690
      Jon Olav Hauglid authored
                 thd->in_sub_stmt || (thd->state..
      
      OPTIMIZE TABLE is not directly supported by InnoDB. Instead,
      recreate and analyze of the table is done. After recreate,
      the table is closed and locks are released before the table
      is reopened and locks re-acquired for the analyze phase.
      
      This assertion was triggered if OPTIMIZE TABLE failed to
      acquire thr_lock locks before starting the analyze phase.
      The assertion tests (among other things) that there no
      active statement transaction. However, as part of acquiring
      the thr_lock lock, external_lock() is called for InnoDB
      tables and this causes a statement transaction to be started.
      If thr_multi_lock() later fails (e.g. due to timeout),
      the failure handling code causes this assert to be triggered.
      
      This patch fixes the problem by doing rollback of the
      current statement transaction in case open_ltable (used by
      OPTIMIZE TABLE) fails to acquire thr_lock locks.
      
      Test case added to lock_sync.test.
      1d35c690
    • Dmitry Lenev's avatar
      Fix for bug #57422 "rpl_row_sp003 sporadically fails under · 0765731e
      Dmitry Lenev authored
      heavy load".
      
      rpl_row_sp003.test has sporadically failed when run on machine
      under heavy load or on slow hardware.
      
      This patch fixes races in the test which were causing these
      failures and also removes unnecessary 100 second wait from it. 
      0765731e
    • Konstantin Osipov's avatar
      Fix Bug#56443 remove last 'mysqld_show_column_type' remains · 4381cefc
      Konstantin Osipov authored
      sql/sql_show.h:
        Remove an unused declaration.
      4381cefc
  3. 12 Oct, 2010 4 commits
  4. 11 Oct, 2010 11 commits
  5. 10 Oct, 2010 2 commits
  6. 09 Oct, 2010 2 commits
    • unknown's avatar
      Manual merge · 9e7b8cbc
      unknown authored
      9e7b8cbc
    • unknown's avatar
      Bug#55375 Transaction bigger than max_binlog_cache_size crashes slave · 3ed0e521
      unknown authored
      When slave executes a transaction bigger than slave's max_binlog_cache_size,
      slave will crash. It is caused by the assert that server should only roll back
      the statement but not the whole transaction if the error ER_TRANS_CACHE_FULL 
      happens. But slave sql thread always rollbacks the whole transaction when
      an error happens.
                  
      Ather this patch, we always clear any error set in sql thread(it is different
      from the error in 'SHOW SLAVE STATUS') and it is cleared before rolling back
      the transaction.
      
      
      mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result:
        SET binlog_cache_size and max_binlog_cache_size for all test cases.
        Add test case for bug#55375.
      mysql-test/suite/rpl/t/rpl_binlog_max_cache_size-master.opt:
        binlog_cache_size and max_binlog_cache_size can be set in the client connection.
        so remove this option file.
      mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test:
        SET binlog_cache_size and max_binlog_cache_size for all test cases.
        Add test case for bug#55375.
      sql/log_event.cc:
        Some functions don't return the error code, so it is a wrong error code.
        The error should always be set into thd->main_da. So we use 
        slave_rows_error_report to report the right error.
      sql/slave.cc:
        exec_relay_log_event() need call cleanup_context() to clear context. 
        clearup_context() will call end_trans().
                
        Clear thd's error before cleanup_context. It avoid to trigger the assert
        which cause this bug.
      3ed0e521
  7. 08 Oct, 2010 15 commits
    • Dmitry Lenev's avatar
      Merged recent changes from mysql-5.5-bugteam into · f78379e0
      Dmitry Lenev authored
      mysql-5.5-runtime tree.
      f78379e0
    • Davi Arnaut's avatar
      Bug#45288: pb2 returns a lot of compilation warnings on linux · 6ead0ea6
      Davi Arnaut authored
      Fix assorted compiler warnings.
      
      sql/mysqld.cc:
        Do not declare max_page_size twice. If large pages support
        is enabled, the code expects the size in max_desired_page_size.
      storage/innobase/include/ibuf0ibuf.h:
        Remove trailing comma. Only present in C99.
        
        Approved by: Vasil (via IRC)
      storage/innobase/include/row0row.h:
        Remove trailing comma. Only present in C99.
        
        Approved by: Vasil (via IRC)
      strings/my_vsnprintf.c:
        No need to assert the obvious.
      6ead0ea6
    • Alexander Barkov's avatar
      The fix for · 3be64d25
      Alexander Barkov authored
       Bug#55744 GROUP_CONCAT + CASE + ucs return garbage
      revealed problems in how character set aggregation
      code works with prepared statements.
      
      This patch fixes (hopefully) the problems.
      3be64d25
    • Davi Arnaut's avatar
      Bug#42733: Type-punning warnings when compiling MySQL -- strict aliasing violations. · 8f53d3a9
      Davi Arnaut authored
      Due to the extent of aliasing violations in the MySQL source
      code, at this time it is safer to disable strict aliasing related
      optimizations in release builds.
      
      As of this patch, only GCC enables strict aliasing by default.
      Hence, use the -fno-strict-aliasing option to disable the
      aliasing rules.
      
      cmake/build_configurations/mysql_release.cmake:
        Add -fno-strict-aliasing to release builds.
      8f53d3a9
    • Mats Kindahl's avatar
      Merging with mysql-5.5-bugteam. · 26d3e108
      Mats Kindahl authored
      26d3e108
    • Mats Kindahl's avatar
      WL#5363: Thread Pool Service Interface · 710c5811
      Mats Kindahl authored
      Adding a comment to scheduler_types on
      the default values used.
      710c5811
    • Mats Kindahl's avatar
      Bug #57338: Extreneous server variable thread_pool_size · bdd2d574
      Mats Kindahl authored
      The server contained code for the server variable and
      option thread_pool_size, but this server variable where
      not used anywhere.
      
      The variable is probably remains from backporting too
      much from 6.0 (specifically, the thread pool
      implementation was not backported from 6.0, which this
      variable is associated with).
      
      This patch eliminates the variable from the server.
      bdd2d574
    • Davi Arnaut's avatar
      Bug#56822: Add a thread state for sessions waiting on the query cache lock · 8cc8930f
      Davi Arnaut authored
      Only wait for a single debug signal at a time as the signal state
      is global. Also, do not activate the query cache debug sync points
      if the thread has no associated THD session.
      
      mysql-test/t/query_cache_debug.test:
        Only wait for a single debug signal at a time as the signal state
        is global.
      sql/sql_cache.cc:
        Do not execute the debug sync point if the thread has no associated
        THD session. This scenario happens for federated threads.
      8cc8930f
    • Tor Didriksen's avatar
      Bug#57209 valgrind + Assertion failed: dst > buf · 12b8fb96
      Tor Didriksen authored
      Buffer overrun when trying to format DBL_MAX
      
      
      mysql-test/r/func_math.result:
        Add test case for Bug#57209
      mysql-test/t/func_math.test:
        Add test case for Bug#57209
      sql/item_strfunc.cc:
        Allocate a larger buffer for the result.
      12b8fb96
    • Vasil Dimov's avatar
      Adjust results files after innodb_file_per_table became 0. · f1e2a7aa
      Vasil Dimov authored
      In calvin.sun@oracle.com-20101005183830-p81bemgffq8l2en9 the default
      value of innodb_file_per_table was changed from 1 to 0.
      f1e2a7aa
    • Sergey Vojtovich's avatar
      Fixed plugin_load_option failure, when example storage · 0fe0e6b5
      Sergey Vojtovich authored
      engine is not available. We need to add loose prefix
      to example load option.
      0fe0e6b5
    • Alexey Botchkov's avatar
      Bug#30025 Mysqld prints out warnings/errors being run with --no-defaults --help · 2d28e398
      Alexey Botchkov authored
              now do no initializations for the --help.
              Do it for --verbose --help though.
      
      per-file comments:
        sql/mysqld.cc
      Bug#30025 Mysqld prints out warnings/errors being run with --no-defaults --help
              quit with the help message at once as --help was given
      2d28e398
    • Alexey Botchkov's avatar
      Bug#35269 mysqlcheck behaves different depending on order of parameters · ccf8dd3f
      Alexey Botchkov authored
              Issue an error if user specifies multiple commands to run.
              Also there was an unnoticed bug that DO_CHECK was actually 0 which lead
              to wrong actions in some cases.
              The mysqlcheck.test contained commands with the suspicious meaning
              for the above reason. Extra commands removed from there.
      
      per-file commands:
        client/mysqlcheck.c
      Bug#35269      mysqlcheck behaves different depending on order of parameters
              Drop with an error if multiple commands.
        mysql-test/r/mysqlcheck.result
      Bug#35269      mysqlcheck behaves different depending on order of parameters
              result completed.
        mysql-test/t/mysqlcheck.test
      Bug#35269      mysqlcheck behaves different depending on order of parameters
              testcase added.
              not-working commands removed from some mysqlcheck calls.
      ccf8dd3f
    • Davi Arnaut's avatar
      Bug#45288: pb2 returns a lot of compilation warnings on linux · 7a85e251
      Davi Arnaut authored
      Fix warnings related to the use of the deprecated gets() function
      and passing NULL to non-pointer argument of the sys_var constructor.
      
      plugin/auth/dialog.c:
        Do not use the deprecated gets() function.
      sql/sys_vars.h:
        Do not pass NULL to a non-pointer argument of the sys_var constructor.
      7a85e251
    • Davi Arnaut's avatar
      Bug#56822: Add a thread state for sessions waiting on the query cache lock · 43547e5a
      Davi Arnaut authored
      Move Query_cache_wait_state declaration out of a debug block.
      43547e5a
  8. 07 Oct, 2010 1 commit