• unknown's avatar
    Bug#18743: Several test cases fails if "classic" configuration in 5.0 · db36a2aa
    unknown authored
    The problem happened because those tests were using "cp932" and "ucs2" without checking whether these character sets are available. This fix moves test parts to make character set specific parts be tested only if they are:
    - some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
    - some parts were moved to the newly added tests "innodb-ucs2.test", "mysqlbinglog-cp932.test" and "sp-ucs2.test"
    
    
    mysql-test/r/ctype_cp932.result:
      Moved cp932-specific test case from mysql.test
    mysql-test/r/innodb.result:
      Moved ucs2-specific test cases to innodb-ucs2.test
    mysql-test/r/mysql.result:
      Move cp932-specific test cases to ctype_cp932.test
    mysql-test/r/mysqlbinlog.result:
      Moved cp932-specific test case to mysqlbinlog-cp932.test
    mysql-test/r/sp.result:
      Moved ucs2-specific test case to sp-ucs2.test
    mysql-test/t/ctype_cp932.test:
      Moved cp932-specific test case from mysql.test
    mysql-test/t/ctype_ucs2_def-master.opt:
      Use the comma-separated list of character sets to avoid mysql-test errors when ucs2 is not available in the server
    mysql-test/t/ctype_ucs2_def.test:
      Added requirement for ucs2 in the server
    mysql-test/t/innodb.test:
      Moved ucs2-specific test cases to innodb-ucs2.test
    mysql-test/t/mysql.test:
      Move cp932-specific test cases to ctype_cp932.test
    mysql-test/t/mysqlbinlog.test:
      Moved cp932-specific test case to mysqlbinlog-cp932.test
    mysql-test/t/sp.test:
      Moved ucs2-specific test case to sp-ucs2.test
    sql/mysqld.cc:
      Allow specifying several character sets for test purposes, to make "mysqld" start even if the character set being tested is not compiled:
      mysqld --default-character-set=ucs2,latin1
      The first available character set will be chosen.
    mysql-test/r/innodb-ucs2.result:
      New BitKeeper file ``mysql-test/r/innodb-ucs2.result''
    mysql-test/r/mysqlbinlog-cp932.result:
      New BitKeeper file ``mysql-test/r/mysqlbinlog-cp932.result''
    mysql-test/r/sp-ucs2.result:
      New BitKeeper file ``mysql-test/r/sp-ucs2.result''
    mysql-test/t/innodb-ucs2.test:
      New BitKeeper file ``mysql-test/t/innodb-ucs2.test''
    mysql-test/t/mysqlbinlog-cp932.test:
      New BitKeeper file ``mysql-test/t/mysqlbinlog-cp932.test''
    mysql-test/t/sp-ucs2.test:
      New BitKeeper file ``mysql-test/t/sp-ucs2.test''
    db36a2aa
sp.result 132 KB