An error occurred fetching the project authors.
  1. 16 Aug, 2006 1 commit
    • unknown's avatar
      This changeset belongs to · 808237b0
      unknown authored
            WL#3397 Refactoring storage engine test cases (for falcon)
          It contains also fixes according to code review.
          Contents: Testcases which were in history dedicated to InnoDB or MyISAM only.
          Modifications:
          1. Shift the main testing code into include/<testing field>.inc
             Introduce $variables which can be used to omit tests for features which are not supported by
             certain storage engines.
          2. The storage engine to be tested is assigned within the toplevel script (t/<whatever>_<engine>.test)
             via variable $engine_type and the the main testing code is sourced from 
             include/<testing field>.inc
          3. Some toplevel testscripts have to be renamed to
             - avoid immediate or future namespace clashes
             - show via filename which storage engine is tested
          4. Minor code cleanup like remove trailing spaces, some additional comments ....
      
      
      mysql-test/t/unsafe_binlog_innodb-master.opt:
        Rename: mysql-test/t/innodb_unsafe_binlog-master.opt -> mysql-test/t/unsafe_binlog_innodb-master.opt
      mysql-test/r/read_many_rows_innodb.result:
        Rename: mysql-test/r/innodb-big.result -> mysql-test/r/read_many_rows_innodb.result
      mysql-test/t/cache_innodb-master.opt:
        Rename: mysql-test/t/innodb_cache-master.opt -> mysql-test/t/cache_innodb-master.opt
      mysql-test/t/concurrent_innodb-master.opt:
        Rename: mysql-test/t/innodb_concurrent-master.opt -> mysql-test/t/concurrent_innodb-master.opt
      BitKeeper/deleted/.del-index_merge.result:
        Delete: mysql-test/r/index_merge.result
      BitKeeper/deleted/.del-index_merge_innodb.result:
        Delete: mysql-test/r/index_merge_innodb.result
      BitKeeper/deleted/.del-index_merge_innodb2.result:
        Delete: mysql-test/r/index_merge_innodb2.result
      BitKeeper/deleted/.del-index_merge_ror.result:
        Delete: mysql-test/r/index_merge_ror.result
      BitKeeper/deleted/.del-index_merge_ror_cpk.result:
        Delete: mysql-test/r/index_merge_ror_cpk.result
      mysql-test/r/index_merge_innodb.result:
        BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/r/index_merge_innodb.result
      mysql-test/t/index_merge_innodb.test:
        BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/index_merge_innodb.test
      mysql-test/t/index_merge_myisam.test:
        BitKeeper file /home/matthias/Arbeit/mysql-5.1-engines/src-1/mysql-test/t/index_merge_myisam.test
      mysql-test/include/concurrent.inc:
        1. This file contains now the main testing code of the former t/innodb_concurrent.test.
        2. It is now sourced by t/concurrent_innodb.test.
      mysql-test/include/deadlock.inc:
        1. This file contains now the main testing code of the former t/innodb-deadlock.test
        2. It is now sourced by t/deadlock_innodb.test.
      mysql-test/include/handler.inc:
        1. This file contains now the main testing code of the former t/innodb_handler.test + t/handler.test.
        2. It is now sourced by t/handler_myisam.test and t/handler_innodb.test.
      mysql-test/include/index_merge1.inc:
        1. This file contains now the main testing code of the former t/index_merge.test.
        2. It is now sourced by t/index_merge_myisam.test.
      mysql-test/include/index_merge2.inc:
        1. This file contains now the main code of t/index_merge_innodb.test.
        2. It is sourced by t/index_merge_myisam.test and t/index_merge_innodb.test.
      mysql-test/include/index_merge_2sweeps.inc:
        1. This file contains now the main code of the former t/index_merge_innodb2.test.
        2. It is sourced by t/index_merge_myisam.test and t/index_merge_innodb.test.
      mysql-test/include/index_merge_ror.inc:
        1. This file contains now the main code of the former t/index_merge_ror.test.
        2. It is sourced by t/index_merge_myisam.test.
      mysql-test/include/index_merge_ror_cpk.inc:
        1. This file contains now the main testing code of the former t/index_merge_ror_cpk.test.
        2. It is now sourced by t/index_merge_myisam.test and t/index_merge_innodb.test.
      mysql-test/include/mix1.inc:
        1. This file contains now the main testing code of the t/innodb_mysql.test
        2. The name mix1.inc was used because the test contains subtests for different fields.
        3. It is sourced by t/innodb_mysql.test.
        4. Fixes:
            - Assign $other_engine_type instead of hardcoded MyISAM.
            - improve comment
            - remove redundant subtest
            - analyze table t4 instead of wrong table t1
            - remove not needed "eval set storage_engine = $engine_type;"
      mysql-test/include/mix2.inc:
        1. This file is a copy of the main testing code of the t/innodb.test
           A copy has to be used, because t/innodb.test is to be maintained by INNOBASE only.
        2. The name mix2.inc was used because the test contains subtests for different fields.
        3. It is sourced by t/mix2_myisam.test.
        4. Fixes:
            - improved comment
            - additional "eval SET SESSION STORAGE_ENGINE = $other_engine_type;" at beginning of tests
            - assign $other_engine_type instead of hardcoded MyISAM or HEAP
            - assign $other_engine_type where it is needed to preserve test logics
            - correct logical bugs
            - improve(extend) "checksum table" test
      mysql-test/include/query_cache.inc:
        1. This file contains now the main testing code of the former t/innodb_cache.test.
        2. It is now sourced by t/cache_innodb.test
      mysql-test/include/read_many_rows.inc:
        1. This file contains now the main testing code of the former t/innodb_big.test.
        2. It is now sourced by t/read_many_rows_innodb.test.
      mysql-test/include/rowid_order.inc:
        1. This file contains now the main testing code of t/rowid_order_innodb.test.
        2. It is now sourced by t/rowid_order_innodb.test.
      mysql-test/include/unsafe_binlog.inc:
        1. This file contains now the main testing code of the former t/innodb_unsafe_binlog.test.
        2. It is now sourced by t/unsafe_binlog_innodb.test.
      mysql-test/r/cache_innodb.result:
        Updated result
      mysql-test/r/concurrent_innodb.result:
        Updated result
      mysql-test/r/deadlock_innodb.result:
        Updated result
      mysql-test/r/handler_innodb.result:
        Updated result
      mysql-test/r/handler_myisam.result:
        Updated result
      mysql-test/r/index_merge_myisam.result:
        Updated result
      mysql-test/r/innodb_mysql.result:
        Updated result
      mysql-test/r/mix2_myisam.result:
        Updated result
      mysql-test/r/rowid_order_innodb.result:
        Updated result
      mysql-test/r/unsafe_binlog_innodb.result:
        Updated result
      mysql-test/t/cache_innodb.test:
        1. Renaming of t/innodb_cache.test to t/cache_innodb.test
        2. Main code is now sourced from include/query_cache.inc.
      mysql-test/t/concurrent_innodb.test:
        1. Renaming of t/innodb_concurrent.test to t/concurrent_innodb.test
        2. Main code is now sourced from include/concurrent.inc.
           Attention: This test fails even in the old version. (BUG#21579).
                      --> added to t/disabled.def
      mysql-test/t/deadlock_innodb.test:
        1. Renaming of t/innodb_deadlock.test to t/deadlock_innodb.test
        2. Main code is now sourced from include/deadlock.inc.
      mysql-test/t/disabled.def:
        Add the test concurrent_innodb because of 
        BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
      mysql-test/t/handler_innodb.test:
        1. Renaming of t/innodb_handler.test to t/handler_innodb.test
        2. Main code is now sourced from include/handler.inc.
           include/handler.inc = united code of former t/handler.test and t/innodb_handler.test
      mysql-test/t/handler_myisam.test:
        1. Renaming of t/handler.test to t/handler_myisam.test
        2. Main code is now sourced from include/handler.inc.
           include/handler.inc = united code of former t/handler.test and t/handler_innodb.test.
      mysql-test/t/innodb_mysql.test:
        1. Main code is now sourced from include/mix1.inc.
        2. Test was not renamed because t/innodb.test refers to it.
      mysql-test/t/mix2_myisam.test:
        New test: MyISAM variant of mix2 ( = t/innodb.test)
      mysql-test/t/read_many_rows_innodb.test:
        1. Renaming of t/innodb_big.test to t/read_many_rows_innodb.test
        2. Main code is now sourced from include/read_many_rows.inc.
      mysql-test/t/rowid_order_innodb.test:
        Main code is now sourced from t/rowid_order.inc.
      mysql-test/t/unsafe_binlog_innodb.test:
        1. Renaming of t/innodb_unsafe_binlog.test to t/unsafe_binlog_innodb.test
        2. Main code is now sourced from include/unsafe_binlog.inc.
      808237b0
  2. 14 May, 2004 1 commit
    • unknown's avatar
      Post-merge fixes. · 3a272c1f
      unknown authored
      Note: One sp.test still fails (prime), and rpl_server_id2.test fails (will be fixed by guilhem ASAP).
      
      
      mysql-test/r/index_merge.result:
        Fixed syntax error (no ',' after last index in create table any more).
      mysql-test/r/index_merge_bdb.result:
        Fixed syntax error (no ',' after last index in create table any more).
      mysql-test/r/index_merge_innodb.result:
        Fixed syntax error (no ',' after last index in create table any more).
      mysql-test/r/index_merge_innodb2.result:
        Fixed syntax error (no ',' after last index in create table any more).
      mysql-test/r/rpl_server_id1.result:
        Update result after merge.
      mysql-test/r/sp-error.result:
        Update result after merge.
      mysql-test/r/variables.result:
        Update result after merge.
      mysql-test/t/index_merge.test:
        Fixed syntax error (no ',' after last index in create table any more).
      mysql-test/t/index_merge_bdb.test:
        Fixed syntax error (no ',' after last index in create table any more).
      mysql-test/t/index_merge_innodb.test:
        Fixed syntax error (no ',' after last index in create table any more).
      mysql-test/t/index_merge_innodb2.test:
        Fixed syntax error (no ',' after last index in create table any more).
      mysql-test/t/sp-error.test:
        Post-merge fix of error codes.
      sql/opt_range.cc:
        Manually merged by Monty.
      sql/opt_range.h:
        Manually merged by Monty.
      sql/slave.cc:
        Post-merge fixes with some help from Guilhem.
      sql/slave.h:
        Post-merge fixes with some help from Guilhem.
      sql/sp_head.cc:
        Got rid of warning (reordering initialization).
      sql/sql_parse.cc:
        Post-merge fix: Need to set/reset select_limit at SP CALL time as well.
      tests/client_test.c:
        Post-merge fix: key_len length in explain has changed.
      3a272c1f
  3. 18 Dec, 2003 1 commit
  4. 09 Dec, 2003 1 commit