1. 21 Jan, 2009 3 commits
    • He Zhenxing's avatar
      Auto merge · e42da654
      He Zhenxing authored
      e42da654
    • He Zhenxing's avatar
      BUG#41653 rpl_innodb_bug30888 fails sporadically on pushbuild: warning in log · 5e0e486a
      He Zhenxing authored
      In mtr.check_warnings, `text` was declares as type text, which is
      64K, and when the server log grows larger than this, it would be
      truncated, and then check_warnings was actually checking the 
      error messages of a previous test and complain warnings.
      
      This patch fixed the problem by change the type of `text` to
      mediumtext, which is 16M.
      
      mysql-test/include/mtr_warnings.sql:
        change the type of `text` to mediumtext
      5e0e486a
    • He Zhenxing's avatar
      BUG#41177 mtr gives no debug info after failing to execute check-testcase/check-warnings · 0a4d9d69
      He Zhenxing authored
      Log output of mysqltest when running check-testcase together
      with errput. Remove --silent option for mysqltest when running
      check-testcase/check-warnings
      
      
      mysql-test/mysql-test-run.pl:
        Log output of mysqltest when runinng check-testcase together with errput.
        Remove --silent option for mysqltest when running check-testcase/check-warnings
      0a4d9d69
  2. 15 Jan, 2009 1 commit
  3. 09 Jan, 2009 1 commit
    • Sven Sandberg's avatar
      BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild · cfeae526
      Sven Sandberg authored
      Problem 1: The test waits for an error in the slave sql thread,
      then resolves the error and issues 'start slave'. However, there
      is a gap between when the error is reported and the slave sql
      thread stops. If this gap was long, the slave would still be
      running when 'start slave' happened, so 'start slave' would fail
      and cause a test failure.
      Fix 1: Made wait_for_slave_sql_error wait for the slave to stop
      instead of wait for error in the IO thread. After stopping, the
      error code is verified. If the error code is wrong, debug info
      is printed. To print debug info, the debug printing code in
      wait_for_slave_param.inc was moved out to a new file,
      show_rpl_debug_info.inc.
      Problem 2: rpl_stm_mystery22 is a horrible name, the comments in
      the file didn't explain anything useful, the test was generally
      hard to follow, and the test was essentially duplicated between
      rpl_stm_mystery22 and rpl_row_mystery22.
      Fix 2: The test is about conflicts in the slave SQL thread,
      hence I renamed the tests to rpl_{stm,row}_conflicts. Refactored
      the test so that the work is done in
      extra/rpl_tests/rpl_conflicts.inc, and
      rpl.rpl_{row,stm}_conflicts merely sets some variables and then
      sourced extra/rpl_tests/rpl_conflicts.inc.
      The tests have been rewritten and comments added.
      Problem 3: When calling wait_for_slave_sql_error.inc, you always
      want to verify that the sql thread stops because of the expected
      error and not because of some other error. Currently,
      wait_for_slave_sql_error.inc allows the caller to omit the error
      code, in which case all error codes are accepted.
      Fix 3: Made wait_for_slave_sql_error.inc fail if no error code
      is given. Updated rpl_filter_tables_not_exist accordingly.
      Problem 4: rpl_filter_tables_not_exist had a typo, the dollar
      sign was missing in a 'let' statement.
      Fix 4: Added dollar sign.
      Problem 5: When replicating from other servers than the one named
      'master', the wait_for_slave_* macros were unable to print debug
      info on the master.
      Fix 5: Replace parameter $slave_keep_connection by
      $master_connection.
      
      
      mysql-test/extra/rpl_tests/rpl_conflicts.test:
        rpl_stm_mystery22 and rpl_row_mystery22 have now been refactored and renamed:
        The two test cases rpl.rpl_stm_conflicts.test and rpl.rpl_row_conflicts.test
        just set some parameters, and then source include/rpl_tests/rpl_conflicts.test.
        Also, cleaned up the test case a bit, and fixed BUG#37718.
      mysql-test/include/show_rpl_debug_info.inc:
        Factored out the debug printing code from wait_for_slave_param.inc to
        a new file, show_rpl_debug_info.inc.
        Also removed the $slave_keep_connection parameter, and replaced it by
        $master_connection. This allows printing debug info on the master, no
        matter what the name of the master connection is.
      mysql-test/include/start_slave.inc:
        Replaced $slave_keep_connection by $master_connection.
      mysql-test/include/stop_slave.inc:
        Replaced $slave_keep_connection by $master_connection.
      mysql-test/include/sync_slave_io_with_master.inc:
        Replaced $slave_keep_connection by $master_connection.
      mysql-test/include/wait_for_slave_io_to_start.inc:
        Replaced $slave_keep_connection by $master_connection.
      mysql-test/include/wait_for_slave_io_to_stop.inc:
        Replaced $slave_keep_connection by $master_connection.
      mysql-test/include/wait_for_slave_param.inc:
        Factored out the debug printing code from wait_for_slave_param.inc to
        a new file, show_rpl_debug_info.inc.
        Also removed the $slave_keep_connection parameter, and replaced it by
        $master_connection. This allows printing debug info on the master, no
        matter what the name of the master connection is.
        Had to move the printing of debug info out of the while loop because
        of BUG number 41913.
      mysql-test/include/wait_for_slave_sql_error.inc:
        Made it wait until the slave sql thread has stopped. This
        takes very short time and avoids race condition bugs in
        test cases (e.g., fixes BUG#37718).
        Replaced $slave_keep_connection by $master_connection.
      mysql-test/include/wait_for_slave_sql_error_and_skip.inc:
        Since wait_for_slave_sql_error now waits for the slave sql
        thread to stop too, wait_for_slave_sql_error_and_skip does not
        have to wait for the slave sql thread to stop.
        Also, since wait_for_slave_sql_error now requires the parameter
        $slave_sql_errno to be set, wait_for_slave_sql_error_and_skip
        requires that as well: updated the usage instructions.
      mysql-test/include/wait_for_slave_sql_to_start.inc:
        Replaced $slave_keep_connection by $master_connection.
      mysql-test/include/wait_for_slave_sql_to_stop.inc:
        Replaced $slave_keep_connection by $master_connection.
      mysql-test/include/wait_for_slave_to_start.inc:
        Replaced $slave_keep_connection by $master_connection.
      mysql-test/include/wait_for_slave_to_stop.inc:
        Replaced $slave_keep_connection by $master_connection.
      mysql-test/suite/rpl/r/rpl_row_conflicts.result:
        update result file
      mysql-test/suite/rpl/r/rpl_stm_conflicts.result:
        update result file
      mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
        Replaced $slave_keep_connection by $master_connection.
      mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test:
        Set $slave_sql_errno, since it is now required.
        Add dollar sign to $show_sql_error (without dollar sign,
        mtr makes it an environment variable).
      mysql-test/suite/rpl/t/rpl_row_conflicts.test:
        rpl_stm_mystery22 and rpl_row_mystery22 have now been refactored and renamed:
        The two test cases rpl.rpl_stm_conflicts.test and rpl.rpl_row_conflicts.test
        just set some parameters, and then source include/rpl_tests/rpl_conflicts.test.
        Also, cleaned up the test case a bit, and fixed BUG#37718.
      mysql-test/suite/rpl/t/rpl_row_mystery22.test:
        rpl_stm_mystery22 and rpl_row_mystery22 have now been refactored and renamed:
        The two test cases rpl.rpl_stm_conflicts.test and rpl.rpl_row_conflicts.test
        just set some parameters, and then source include/rpl_tests/rpl_conflicts.test.
        Also, cleaned up the test case a bit, and fixed BUG#37718.
      mysql-test/suite/rpl/t/rpl_stm_conflicts.test:
        rpl_stm_mystery22 and rpl_row_mystery22 have now been refactored and renamed:
        The two test cases rpl.rpl_stm_conflicts.test and rpl.rpl_row_conflicts.test
        just set some parameters, and then source include/rpl_tests/rpl_conflicts.test.
        Also, cleaned up the test case a bit, and fixed BUG#37718.
      cfeae526
  4. 08 Jan, 2009 2 commits
    • Luis Soares's avatar
      merge: 5.1 -> 5.1-rpl · a6ff6295
      Luis Soares authored
      conflicts:
        Text conflict in mysql-test/lib/mtr_report.pm
        Text conflict in mysql-test/mysql-test-run.pl
      a6ff6295
    • Sven Sandberg's avatar
      BUG#41959: mtr: error message when mkpath() fails and the file exists but is not directory · 1596aeec
      Sven Sandberg authored
      Problem: when mtr tries to create a directory, and the target
      exists but is a file instead of directory, it tries several times
      to create the directory again before it fails.
      Fix: make it check if the target exists and is a non-directory.
      
      
      mysql-test/lib/My/File/Path.pm:
        mkpath() now stops with appropriate error message if the target
        exists but is a non-directory.
      1596aeec
  5. 07 Jan, 2009 1 commit
  6. 28 Dec, 2008 5 commits
  7. 26 Dec, 2008 1 commit
    • He Zhenxing's avatar
      BUG#41708 rpl.rpl_flushlog_loop fails in pushbuild producing non-deterministic result file · 963eea19
      He Zhenxing authored
      If server has not been initialized as a slave (by CHANGE MASTER), then
      SHOW SLAVE STATUS will return an empty set, and caused the waiting for
      Slave_IO_running or Slave_SQL_running to 'No' fail.
      
      This patch fixed the problem by return immediately if slave is not
      initialized in include/wait_for_slave_*_to_stop.inc.
      
      
      mysql-test/include/wait_for_slave_io_to_stop.inc:
        Return immediately if slave is not initialized
      mysql-test/include/wait_for_slave_sql_to_stop.inc:
        Return immediately if slave is not initialized
      mysql-test/include/wait_for_slave_to_stop.inc:
        Return immediately if slave is not initialized
      963eea19
  8. 25 Dec, 2008 1 commit
    • He Zhenxing's avatar
      BUG#40704 main.events_restart fails sporadically in pushbuild: "server has gone away" · de69078c
      He Zhenxing authored
      mysqltest command 'shutdown_server' is supposed to shutdown the server
      and wait for it to be gone, and kill it when timeout. But because the
      arguments passed to my_kill were in the wrong order, 'shutdown_server'
      does not wait nor kill the server at all. So after 'shutdown_server',
      the server is still running, and the server may still accepting
      connections.
      
      
      mysql-test/include/mtr_warnings.sql:
        Suppress forcing close thread messages when server shuts down
      mysql-test/include/restart_mysqld.inc:
        wait_until_disconnected.inc is not required after fix shutdown_server command
      de69078c
  9. 19 Dec, 2008 8 commits
  10. 18 Dec, 2008 7 commits
  11. 17 Dec, 2008 2 commits
    • Joerg Bruehe's avatar
      Merge the 5.0.74 build into the main tree. · f334f094
      Joerg Bruehe authored
      f334f094
    • John H. Embretsen's avatar
      Fix (preliminary?) for Bug#41502 - MTR v2 should not load plugins during server bootstrap. · 371591c0
      John H. Embretsen authored
      Adding --loose-skip-falcon option to the mysqld options provided by MTR (v2) during mysqld bootstrap in order to avoid plugin (in this case Falcon) initialization of static variables etc. Options --loose-skip-innodb and --loose-skip-ndbcluster were already included.
      
      This will fix Bug#41014 (falcon_bug_39708 fails in pushbuild in 6.0-rpl: "succeeded - should have failed")
      in the case of MTR v2 (which currently is available in -rpl branches only). 
      MTR v1 (e.g. in main 6.0 branch) does not have this problem.
      
      It would be more ideal to remove the --loose-skip-* options and provide a single option disabling all plugin initialization instead, or have bootstrap do this by default. Server modifications are (most likely) needed to be able to do that.
      
      
      mysql-test/mysql-test-run.pl:
        Reintroduced the --loose-skip-falcon bootstrap option used by the previous version of this test runner.
      371591c0
  12. 15 Dec, 2008 1 commit
  13. 13 Dec, 2008 2 commits
  14. 12 Dec, 2008 5 commits
    • Andrei Elkin's avatar
      merge 5.1-rpl repository -> 5.1-rpl local · 6a3bcb42
      Andrei Elkin authored
      6a3bcb42
    • Andrei Elkin's avatar
      Bug #40129 no-threads fails on pushbuild in 6.0-rpl, ps_stm_threadpool · a91dd091
      Andrei Elkin authored
            
      The test reacted on the way how mtr orders arguments for the server
      that are gathered from different source. It appeared that the opt-file
      options were parsed before those that supplied to mtr via its command
      line. In effect, the opt-file preferences got overriden by the command
      line and some tests, like no-threads, were caught by surprise: a test
      expects an option value that had been "hardcoded" into its opt-file
      but gets another one.
      This server options ordering problem exists on in the new rpl trees
      mtr.  In option of the author of this patch, the opt-file shall be
      considered as having the highest preference weight. The opt-file is
      merely a part of the header of a test, namely a part that can not be
      technically deployed along the test file.
      It's unnatural for the test writer to provide both the opt file value
      and a guard that guarantees the value will be set on in the run time.
      It's logical to provide either one: the option and its value or the
      guard.
      
      Fixed with relocating parse of the opt file to be the last among
      sources of the sever's options.
      
      A side effect: fixing a small problem of resetting the suite options
      at time the opt file starts parsing.
      
      A side effect: main.log_bin_trust_function_creators_func is disabled to
      be re-enabled with the fixes for bug#41003 will be merged from the main trees.
      
      
      mysql-test/lib/mtr_cases.pm:
        Relocating parse of the opt file to be the last. This ensure the opt file is the last
        provider for the server options so that the opt-file options have the highest preference;
        fixing a separate issue of incorrect resetting the suite options for the server;
      mysql-test/t/disabled.def:
        log_bin_trust_function_creators_func is disabled. Todo: to-reable when fixes for bug#41003
        will be merged from the main trees.
      a91dd091
    • Bjorn Munch's avatar
      Bug #31983 Running mysql-test from RPM fails for NDB · 5ee9db71
      Bjorn Munch authored
      Added $glob_basedir/sbin to search path for relevant binaries
      5ee9db71
    • Serge Kozlov's avatar
      Bug#41186: Possible reason of bug is waiting any sql error on slave instead · 21f623c4
      Serge Kozlov authored
      exact number of error. The patch does following:
      1) Add new parameter $slave_sql_errno for wait_for_slave_sql_error.inc
      2) Add waiting error 1062 (Duplicate PK) for slave SQL thread in test case.
      21f623c4
    • Serge Kozlov's avatar
      Bug#41108: It is a testcase timeout bug so the patch fixes test code in places · 67a482d0
      Serge Kozlov authored
      where timeout can happen:
      1. Added waiting start/stop slave to make sure that slave works properly.
      2. Added cleanup for slave.
      3. Updated related result files.
      67a482d0