1. 04 Oct, 2006 21 commits
    • 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/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 "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/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/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
    • unknown's avatar
  2. 03 Oct, 2006 11 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 7d041332
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      client/mysqltest.c:
        Auto merged
      7d041332
    • unknown's avatar
      Add possibility to send warnings about suspicious commands in .test file to... · a0cec361
      unknown authored
      Add possibility to send warnings about suspicious commands in .test file to <result_file_name>.warnings file
      Move detection of "parsing enabled" to after command has been read.
      Cleanup parsing enabled/disabled
      
      
      
      a0cec361
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 5e79dd3e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      client/mysqltest.c:
        Auto merged
      5e79dd3e
    • unknown's avatar
      c0a2f10f
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools · 021931d9
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      client/mysqltest.c:
        Auto merged
      021931d9
    • unknown's avatar
      Add mysys/my_copy.c as sources for mysqltest · 172ebaa0
      unknown authored
      172ebaa0
    • unknown's avatar
      Fix typo · 0a5c756a
      unknown authored
      - Change con_host to ds_connection_name.str
      
      
      client/mysqltest.c:
        Change con_host to ds_connection_name.str
      0a5c756a
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools · e8edc24b
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools
      
      
      mysql-test/include/ps_query.inc:
        Auto merged
      mysql-test/r/check.result:
        Auto merged
      mysql-test/r/connect.result:
        Auto merged
      mysql-test/r/flush.result:
        Auto merged
      mysql-test/r/flush_block_commit.result:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/r/lock_multi.result:
        Auto merged
      mysql-test/r/mix_innodb_myisam_binlog.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_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/rename.result:
        Auto merged
      mysql-test/r/rpl000001.result:
        Auto merged
      mysql-test/r/rpl_error_ignored_table.result:
        Auto merged
      mysql-test/r/rpl_master_pos_wait.result:
        Auto merged
      BitKeeper/deleted/.del-rpl000018.test:
        Auto merged
      BitKeeper/deleted/.del-rpl_heap.test:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/synchronization.result:
        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/rpl_flush_tables.test:
        Auto merged
      mysql-test/t/rpl_trunc_temp.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      BitKeeper/deleted/.del-show_msg80.inc:
        Delete: mysql-test/include/show_msg80.inc
      BitKeeper/deleted/.del-init_file.result:
        Delete: mysql-test/r/init_file.result
      BitKeeper/deleted/.del-mysql_client_test.result:
        Delete: mysql-test/r/mysql_client_test.result
      BitKeeper/deleted/.del-show_msg.inc:
        Delete: mysql-test/include/show_msg.inc
      client/Makefile.am:
        Use local file
      client/mysqltest.c:
        Use backported version of mysqltest
      mysql-test/r/mysqltest.result:
        Use backported file
      mysql-test/t/mysqltest.test:
        Use backported version
      mysql-test/r/type_blob.result:
        Manual merge
      mysql-test/t/connect.test:
        Used local version
      mysql-test/t/init_file.test:
        Manual merge
      mysql-test/t/mysql_client_test.test:
        Manual merge
      mysql-test/t/type_blob.test:
        Manual merge
      e8edc24b
    • unknown's avatar
      Delete files now moved into mysqltest.test · 6965f599
      unknown authored
      
      BitKeeper/deleted/.del-sourced.inc:
        Delete: mysql-test/include/sourced.inc
      BitKeeper/deleted/.del-mysqltest_while.inc:
        Delete: mysql-test/include/mysqltest_while.inc
      BitKeeper/deleted/.del-sourced1.inc:
        Delete: mysql-test/include/sourced1.inc
      6965f599
    • unknown's avatar
      Add two new result files · e94d528d
      unknown authored
      
      mysql-test/r/init_file.result:
        Add new file init_file.result
      mysql-test/r/mysql_client_test.result:
        Add new file mysql_client_test.result
      e94d528d
    • unknown's avatar
      Update mysqltest to latest version · 115d4808
      unknown authored
       - ie. backport from 5.1
       - also update testcase error dected by new version
      
      
      mysql-test/include/show_msg.inc:
        BitKeeper file /home/msvensson/mysql/same_tools/my41-same_tools/mysql-test/include/show_msg.inc
      mysql-test/include/show_msg80.inc:
        BitKeeper file /home/msvensson/mysql/same_tools/my41-same_tools/mysql-test/include/show_msg80.inc
      BitKeeper/deleted/.del-rpl_chain_temp_table.test:
        Delete: mysql-test/t/rpl_chain_temp_table.test
      BitKeeper/deleted/.del-rpl_chain_temp_table.result:
        Delete: mysql-test/r/rpl_chain_temp_table.result
      BitKeeper/deleted/.del-rpl_failsafe.result:
        Delete: mysql-test/r/rpl_failsafe.result
      BitKeeper/deleted/.del-rpl_failsafe.test:
        Delete: mysql-test/t/rpl_failsafe.test
      BitKeeper/deleted/.del-rpl_heap.test:
        Delete: mysql-test/t/rpl_heap.test
      BitKeeper/deleted/.del-rpl_heap.result:
        Delete: mysql-test/r/rpl_heap.result
      BitKeeper/deleted/.del-rpl000018.result:
        Delete: mysql-test/r/rpl000018.result
      BitKeeper/deleted/.del-rpl000018.test:
        Delete: mysql-test/t/rpl000018.test
      client/Makefile.am:
        Link mysqltest with mysys/my_copy.c
      client/mysqltest.c:
        Update mysqltest to latest version
      mysql-test/include/have_multi_ndb.inc:
        Remove old syntax "@filename" in favor of "--require filename"
      mysql-test/include/master-slave.inc:
        Remove old syntax "@filename" in favor of "--require filename"
      mysql-test/include/ps_query.inc:
        Remove the comment about no output now when it does.
      mysql-test/r/check.result:
        Update output from --send
      mysql-test/r/connect.result:
        Update result file for connect test after backport form 5.1
      mysql-test/r/flush.result:
        Update output from --send
      mysql-test/r/flush_block_commit.result:
        Update output from --send
      mysql-test/r/func_misc.result:
        Update output from --send
      mysql-test/r/grant2.result:
        Update output from --send
      mysql-test/r/handler.result:
        Update output from --send
      mysql-test/r/kill.result:
        Update output from --send
      mysql-test/r/lock_multi.result:
        Update output from --send
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Update output from --send
      mysql-test/r/mysqltest.result:
        Update mysqltest.result after backport
      mysql-test/r/ps_2myisam.result:
        Update result as the output from query is now printed
      mysql-test/r/ps_3innodb.result:
        Update result as the output from query is now printed
      mysql-test/r/ps_4heap.result:
        Update result as the output from query is now printed
      mysql-test/r/ps_5merge.result:
        Update result as the output from query is now printed
      mysql-test/r/ps_6bdb.result:
        Update result as the output from query is now printed
      mysql-test/r/ps_7ndb.result:
        Update result as the output from query is now printed
      mysql-test/r/rename.result:
        Update output from --send
      mysql-test/r/rpl000001.result:
        Update output from --send
      mysql-test/r/rpl_error_ignored_table.result:
        Update output from --send
      mysql-test/r/rpl_master_pos_wait.result:
        Update output from --send
      mysql-test/r/subselect.result:
        Update result file after adding missing ;
      mysql-test/r/synchronization.result:
        Update output from --send
      mysql-test/r/type_blob.result:
        Update result file after adding missing ;
      mysql-test/t/connect.test:
        Backport test from 5.1
      mysql-test/t/init_file.test:
        Update test so something is printed
      mysql-test/t/mysql_client_test.test:
        Update test so result is sent to file and something is printed
      mysql-test/t/mysqltest.test:
        Backport latest mysqltest.test file
      mysql-test/t/ps.test:
        Move the --replace_column statement to just before the statetement it should replace
      mysql-test/t/ps_1general.test:
        Move the --replace_column statement to just before the statetement it should replace
      mysql-test/t/ps_grant.test:
        Remove the $DB, no other test uses it
      mysql-test/t/rpl_flush_tables.test:
        Fetch $SERVER_VERSION from the db server
      mysql-test/t/rpl_trunc_temp.test:
        Remove the selection of connection master after it's been disconnected already
      mysql-test/t/subselect.test:
        Add missing ;
      mysql-test/t/type_blob.test:
        Add missing ;
      115d4808
  3. 27 Sep, 2006 1 commit
  4. 15 Sep, 2006 7 commits