1. 05 Oct, 2006 4 commits
  2. 04 Oct, 2006 26 commits
  3. 03 Oct, 2006 10 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