1. 05 Oct, 2006 9 commits
  2. 04 Oct, 2006 31 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools · c826d5a1
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/im_utils.result:
        SCCS merged
      c826d5a1
    • unknown's avatar
      Update result file · abe94eca
      unknown authored
      Get server version from mysqld
      
      
      mysql-test/r/lock_multi.result:
        Update result format to latest version of mysqltest, remove leading scpace from query that has been "send"
      mysql-test/t/rpl_truncate_7ndb.test:
        get server version from mysqld
      abe94eca
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 3d1a1faf
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      3d1a1faf
    • unknown's avatar
      Fix detection of debug binaries. If mysqld ouputs "debug xx" in the variable... · 78588425
      unknown authored
      Fix detection of debug binaries. If mysqld ouputs "debug xx" in the variable list it's a debug binary
      
      
      78588425
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 5a5d8c1e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      5a5d8c1e
    • unknown's avatar
      f495f0a8
    • unknown's avatar
      Update result file · 257ad8e1
      unknown authored
      
      mysql-test/r/im_utils.result:
        Change order of ouput, skip-bdb is now after skip-ndbcluster
      257ad8e1
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 071ff470
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      071ff470
    • unknown's avatar
      Add skip-bdb to im defaults file in 5.0 · 479db3e4
      unknown authored
      479db3e4
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools · 459e573e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Auto merged
      mysql-test/r/rpl_stm_charset.result:
        Auto merged
      459e573e
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 89ee2c42
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      client/mysqltest.c:
        Auto merged
      89ee2c42
    • unknown's avatar
      Update test results to new mysqltest · b1b6d21d
      unknown authored
      Remove extra space for "send" commands
      
      
      mysql-test/extra/rpl_tests/rpl_truncate_helper.test:
        Get $SERVER_VERSION from the mysqld
      mysql-test/r/flush_table.result:
        Remove extra space for "send" commands
      mysql-test/r/handler_innodb.result:
        Remove extra space for "send" commands
      mysql-test/r/lock_multi.result:
        Remove extra space for "send" commands
      mysql-test/r/log_tables.result:
        Remove extra space for "send" commands
      b1b6d21d
    • unknown's avatar
      Update "get_errcode_from_name" · fc900352
      unknown authored
       - add missing DBUG_RETURN
       - Change type of st_error->code to uint, that should be more than enough
         to hold the error numbers between 1000 and around 2000
      
      fc900352
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 22a68422
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      22a68422
    • unknown's avatar
      934085bd
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 1f76fb69
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/rpl_charset.result:
        Use local
      mysql-test/t/rpl_charset.test:
        Manual merge(basically keep test file as is in 5.0)
      1f76fb69
    • unknown's avatar
      875d0592
    • unknown's avatar
    • unknown's avatar
      Clean up de_before_start_master/slave · 94bc16cf
      unknown authored
      94bc16cf
    • unknown's avatar
      Use replace_regex to mask the output of file_id= in "show binlog events" that... · 27b4888f
      unknown authored
      Use replace_regex to mask the output of file_id= in "show binlog events" that depends on previous tests
      What is this? replace_regex in 4.1! :)
      
      
      mysql-test/r/rpl_charset.result:
        Use replace_regex to mask the output of file_id= in "show binlog events" that depends on previous tests
      mysql-test/t/rpl_charset.test:
        Use replace_regex to mask the output of file_id= in "show binlog events" that depends on previous tests
      27b4888f
    • unknown's avatar
      Set slave_load_path to ../../var/tmp in version prior to 5.0 to be compatible... · 1d6abe88
      unknown authored
      Set slave_load_path to ../../var/tmp in version prior to 5.0 to be compatible with mysql-test-run.sh
      
      
      1d6abe88
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools · 10b87a4c
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      10b87a4c
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 1b939d73
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      1b939d73
    • unknown's avatar
      Create the mysqld.spec file with a unique name in mysql-test dir, $opt_var_dir... · 1242d0fc
      unknown authored
      Create the mysqld.spec file with a unique name in mysql-test dir, $opt_var_dir haven't been created yet
      
      
      1242d0fc
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 956f4577
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      956f4577
    • unknown's avatar
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools · 31276d6c
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my51-same_tools
      
      
      BitKeeper/deleted/.del-mtr_stress.pl:
        Auto merged
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      BitKeeper/deleted/.del-rpl000018.result:
        Auto merged
      BitKeeper/deleted/.del-rpl000018.test:
        Auto merged
      BitKeeper/deleted/.del-rpl_chain_temp_table.result:
        Auto merged
      BitKeeper/deleted/.del-rpl_chain_temp_table.test:
        Auto merged
      BitKeeper/deleted/.del-rpl_failsafe.result:
        Auto merged
      BitKeeper/deleted/.del-rpl_failsafe.test:
        Auto merged
      BitKeeper/deleted/.del-rpl_heap.result:
        Auto merged
      BitKeeper/deleted/.del-rpl_heap.test:
        Auto merged
      mysql-test/include/have_ndb.inc:
        Auto merged
      mysql-test/include/master-slave.inc:
        Auto merged
      mysql-test/lib/mtr_misc.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      mysql-test/r/connect.result:
        Auto merged
      mysql-test/r/csv.result:
        Auto merged
      mysql-test/r/drop.result:
        Auto merged
      mysql-test/r/flush_block_commit.result:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/r/grant2.result:
        Auto merged
      mysql-test/r/handler_myisam.result:
        Auto merged
      mysql-test/r/multi_update.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/query_cache_notembedded.result:
        Auto merged
      mysql-test/r/rpl_err_ignoredtable.result:
        Auto merged
      mysql-test/r/rpl_master_pos_wait.result:
        Auto merged
      mysql-test/r/rpl_stm_000001.result:
        Auto merged
      mysql-test/r/sp-threads.result:
        Auto merged
      mysql-test/r/sp_notembedded.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/synchronization.result:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      mysql-test/t/connect.test:
        Auto merged
      mysql-test/t/csv.test:
        Auto merged
      mysql-test/t/mysql_client_test.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/ps_1general.test:
        Auto merged
      mysql-test/t/ps_grant.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/rpl_trunc_temp.test:
        Auto merged
      mysql-test/t/sp-error.test:
        Auto merged
      mysql-test/t/sp_notembedded.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        SCCS merged
      31276d6c
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 671e2e10
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/lib/mtr_io.pl:
        Auto merged
      BitKeeper/deleted/.del-mtr_stress.pl:
        Delete: mysql-test/lib/mtr_stress.pl
      mysql-test/include/have_ndb.inc:
        SCCS merged
      671e2e10
    • unknown's avatar
      Fixup the regex's parsing the mysqld's version and variables · 2d26218e
      unknown authored
      Add paths for ndb binaries
      Some more backport issues
      
      
      mysql-test/include/have_ndb.inc:
        Remove the check for NDB_STATUS_OK, handled by mysql-test-run.pl
      2d26218e
    • unknown's avatar
      Update tests and result files after running with new mysqltest that better... · a22d8814
      unknown authored
      Update tests and result files after running with new mysqltest that better detects problems with test files
      
      
      mysql-test/r/csv.result:
        Update after add of missing semicolon
      mysql-test/r/drop.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/flush.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/flush_block_commit.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/flush_read_lock_kill.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/grant2.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/handler.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/innodb_notembedded.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/kill.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/lock_multi.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/multi_update.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/mysqltest.result:
        Update result
      mysql-test/r/query_cache.result:
        Update after add of missing semicolon
      mysql-test/r/query_cache_notembedded.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/sp-threads.result:
        Update result file, no space before commands that has been "sent"
      mysql-test/r/sp_notembedded.result:
        Update after add of missing semicolon
      mysql-test/r/type_blob.result:
        Remove extra drop table
      mysql-test/t/csv.test:
        Add missing semicolon
      mysql-test/t/query_cache.test:
        Add missing semicolon
      mysql-test/t/sp-error.test:
        Remove "tab" from end of error declaration
      mysql-test/t/sp.test:
        Wrong delimiter, used ; instead of |
      mysql-test/t/sp_notembedded.test:
        Wrong delimiter, used ; instead of |
      mysql-test/t/view_grant.test:
        An incomplete error name specification was used.
      a22d8814
    • unknown's avatar
      Backport from 5.1 · e4224a27
      unknown authored
       -Add support for detecting version and features from mysqld binary
       - Autodetect netware
       - Disable some features not available below 5.0
       - Cleanup executable_setup to look for one executable at a time, only llok for the ones that are needed based on the selected testcases and settings
      
      
      mysql-test/lib/mtr_cases.pl:
        Backport from 5.1
      mysql-test/lib/mtr_io.pl:
        Backport from 5.1
        Add new function mtr_appendfile_to_file
      mysql-test/lib/mtr_misc.pl:
        Backport from 5.1
      mysql-test/lib/mtr_process.pl:
        Backport from 5.1
      mysql-test/lib/mtr_report.pl:
        Backport from 5.1
      mysql-test/mysql-test-run.pl:
        Add support for detecting version and features from mysqld binary
        Autodetect netware
        Disable some features not available below 5.0
        Cleanup executable_setup to look for one executable at a time, only llok for the ones that are needed based on the selected testcases and settings
      mysql-test/r/mysqltest.result:
        Update result
      mysql-test/lib/mtr_im.pl:
        New BitKeeper file ``mysql-test/lib/mtr_im.pl''
      mysql-test/lib/mtr_stress.pl:
        New BitKeeper file ``mysql-test/lib/mtr_stress.pl''
      e4224a27