An error occurred fetching the project authors.
  1. 16 Jun, 2008 1 commit
    • Matthias Leich mleich@mysql.com's avatar
      Fix for · 28f97047
      Matthias Leich mleich@mysql.com authored
         Bug#37167 funcs_1: Many tests fail if the embedded server is used.
         Bug#37164 funcs_1: Some tests fail if an optional character set is missing.
      + some cleanup within the testsuite related to the fixes above
      + some adjustments to open bugs on Mac OS X
      
      Details:
      - Remove the initial loading of data from tests if these data
        are not somewhere retrieved
      - Remove any use of columns with attribute unicode
        (-> UCS2 is no more needed) from tests where unicode
        properties are not checked or somehow required
      - Create a separate branch of the Character maximum length test
        (CML). If UCS2 is available than this test gets applied to
        every available type of string column with attribute unicode
        This prevents any loss of coverage by the points above.
      - Disable the execution of is_tables_ndb which gives wrong
        results because of a bug. Correct the exepected results of
        this test.
      - In case of tests failing when applied to the embedded server
          1) Create a variant of this test for the embedded server
        or
          2) Skip the test in case of embedded server
        depending on purpose and complexity of test.
      - Skip the tests which could suffer from
        Bug 28309 First insert violates unique constraint - was "memory" table empty ?
        Bug 37380 Test funcs_1.is_columns_myisam_embedded fails on OS X
        (both bugs Mac OS X, embedded server, MySQL 5.0 only)
      - Minor improvements like remove typos
      28f97047
  2. 07 Mar, 2008 2 commits
    • unknown's avatar
      Post merge fixes after · 633cc34c
      unknown authored
      ChangeSet@1.2561, 2008-03-07 17:44:03+01:00, mleich@five.local.lan +132 -0
        Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
        into  five.local.lan:/work/merge/mysql-5.1-funcs_1
        MERGE: 1.1810.3473.24
      
      ChangeSet@1.1810.3473.24, 2008-03-07
        WL#4203 Reorganize and fix the data dictionary tests of
                testsuite funcs_1
      
        1. Adjustment of expected results to modified server properties
        2. Add some tests of information_schema views
        3. Minor corrections and improvements
      
      
      BitKeeper/deleted/.del-ndb__datadict.result:
        Delete: mysql-test/suite/funcs_1/r/ndb__datadict.result
      BitKeeper/deleted/.del-ndb__datadict.test:
        Delete: mysql-test/suite/funcs_1/t/ndb__datadict.test
      BitKeeper/deleted/.del-ndb__load.test:
        Delete: mysql-test/suite/funcs_1/t/ndb__load.test
      BitKeeper/deleted/.del-ndb__load.result:
        Delete: mysql-test/suite/funcs_1/r/ndb__load.result
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
        Make the results independend of amount of preceding tests.
      mysql-test/suite/funcs_1/datadict/processlist_val.inc:
        Correct the cleanup
      mysql-test/suite/funcs_1/r/charset_collation_1.result:
        Updated results
      mysql-test/suite/funcs_1/r/charset_collation_2.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_func_view.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_basics_mixed.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_character_sets.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_collations.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_column_privileges.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_innodb.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_is.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_memory.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_myisam.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_columns_mysql.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_key_column_usage.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_routines.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_schema_privileges.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_schemata.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_statistics.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_statistics_mysql.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_table_constraints.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_table_privileges.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_is.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_mysql.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_tables_ndb.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_triggers.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_user_privileges.result:
        Updated results
      mysql-test/suite/funcs_1/r/is_views.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_func_view.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_func_view.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_func_view.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc_02.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/ndb_storedproc_10.result:
        Updated results
      mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
        Updated results
      mysql-test/suite/funcs_1/r/processlist_priv_ps.result:
        Updated results
      mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
        Updated results
      mysql-test/suite/funcs_1/r/processlist_val_ps.result:
        Updated results
      mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
        Set subtest checking a no more reserved keyword
        to comment.
      mysql-test/suite/funcs_1/t/disabled.def:
        ndb__datadict is dropped. The checks are done in
        other scripts.
      mysql-test/suite/funcs_1/t/is_routines.test:
        Correction of comment
      mysql-test/suite/funcs_1/t/is_triggers.test:
        Adjustment to changes in privilege system between
        MySQL 5.0 and 5.1.
      mysql-test/suite/funcs_1/t/is_views.test:
        Correction of comment.
      mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test:
        Correction of comment.
      mysql-test/suite/funcs_1/t/processlist_priv_ps.test:
        Correction of comment.
      mysql-test/suite/funcs_1/t/processlist_val_no_prot.test:
        Correction of comment.
      mysql-test/suite/funcs_1/t/processlist_val_ps.test:
        Correction of comment.
      mysql-test/suite/funcs_1/r/is_engines.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_archive.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_blackhole.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_csv.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_federated.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_innodb.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_memory.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_merge.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_engines_myisam.result:
        Expected results
      mysql-test/suite/funcs_1/t/is_engines.test:
        Test of information_schema.engines
      mysql-test/suite/funcs_1/t/is_engines_archive.test:
        Test of information_schema.engines
            Variant for ARCHIVE
      mysql-test/suite/funcs_1/t/is_engines_blackhole.test:
        Test of information_schema.engines
            Variant for BLACKHOLE
      mysql-test/suite/funcs_1/t/is_engines_csv.test:
        Test of information_schema.engines
            Variant for CSV
      mysql-test/suite/funcs_1/t/is_engines_federated.test:
        Test of information_schema.engines
            Variant for FEDERATED
      mysql-test/suite/funcs_1/t/is_engines_innodb.test:
        Test of information_schema.engines
            Variant for InnoDB
      mysql-test/suite/funcs_1/t/is_engines_memory.test:
        Test of information_schema.engines
            Variant for MEMORY
      mysql-test/suite/funcs_1/t/is_engines_merge.test:
        Test of information_schema.engines
            Variant for MERGGE
      mysql-test/suite/funcs_1/t/is_engines_myisam.test:
        Test of information_schema.engines
            Variant for MyISAM
      mysql-test/suite/funcs_1/t/is_engines_ndb.test:
        Test of information_schema.engines
            Variant for NDB
      mysql-test/suite/funcs_1/t/is_events.test:
        Test for information_schema.events
      mysql-test/suite/funcs_1/r/is_engines_ndb.result:
        Expected results
      mysql-test/suite/funcs_1/r/is_events.result:
        Expected results
      633cc34c
    • unknown's avatar
      WL#4203 Reorganize and fix the data dictionary tests of · d6e42aac
      unknown authored
              testsuite funcs_1
      1. Fix the following bugs
         Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
            Solution: Test variants charset_collation_* adjusted to different builds
         Bug#32603 "datadict" tests (all engines) fail in "community" tree: "PROFILING" table
            Solution: Excluding "PROFILING" table from queries
         Bug#33654 "slow log" is missing a line
            Solution: Unify the content of the fields TABLES.TABLE_ROWS and
                      STATISTICS.CARDINALITY within result sets
         Bug#34532 Some funcs_1 tests do not clean up at end of testing
            Solution: DROP objects/reset global server variables modified during testing
                      + let tests missing implementation end before loading of tables
         Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
            Solution: Cut <engine>__datadict tests into smaller tests + generate new results.
         Bug#33599 INFORMATION_SCHEMA.STATISTICS got a new column INDEX_COMMENT: tests fail (2)
            Generation of new results during post merge fix
         Bug#33600 CHARACTER_OCTET_LENGTH is now CHARACTER_MAXIMUM_LENGTH * 4
            Generation of new results during post merge fix
         Bug#33631 Platform-specific replace of CHARACTER_MAXIMUM_LENGTH broken by 4-byte encoding
            Generation of new results during post merge fix
            + removal of platform-specific replace routine (no more needed)
      2. Restructure the tests
         - Test not more than one INFORMATION_SCHEMA view per testscript
         - Separate tests of I_S view layout+functionality from content related to the
           all time existing databases "information_schema", "mysql" and "test"
         - Avoid storage engine related variants of tests which are not sensible to
           storage engines at all.
      3. Reimplement or add some subtests + cleanup
         There is a some probability that even the reviewed changeset
         - does not fix all bugs from above   or
         - contains new bugs which show up on some platforms <> Linux or on one of
           the various build types
      4. The changeset contains fixes according to
         - one code review
         - minor bugs within testing code found after code review (accepted by reviewer)
         - problems found during tests with 5.0.56 in build environment
      
      
      mysql-test/suite/funcs_1/t/innodb_storedproc_02.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/innodb_storedproc_03.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/innodb_storedproc_06.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/innodb_storedproc_07.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/innodb_storedproc_08.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/innodb_storedproc_10.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/storedproc/storedproc_07.inc:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/storedproc/storedproc_08.inc:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc:
        Change mode to -rw-rw-r--
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
        Change mode to -rw-rw-r--
      BitKeeper/deleted/.del-innodb__load.test:
        Delete: mysql-test/suite/funcs_1/t/innodb__load.test
      BitKeeper/deleted/.del-innodb__load.result:
        Delete: mysql-test/suite/funcs_1/r/innodb__load.result
      BitKeeper/deleted/.del-myisam__load.test:
        Delete: mysql-test/suite/funcs_1/t/myisam__load.test
      BitKeeper/deleted/.del-memory__load.test:
        Delete: mysql-test/suite/funcs_1/t/memory__load.test
      BitKeeper/deleted/.del-memory__load.result:
        Delete: mysql-test/suite/funcs_1/r/memory__load.result
      BitKeeper/deleted/.del-myisam__load.result:
        Delete: mysql-test/suite/funcs_1/r/myisam__load.result
      BitKeeper/deleted/.del-create_database.inc:
        Delete: mysql-test/suite/funcs_1/include/create_database.inc
      BitKeeper/deleted/.del-create_user_lowest_priv.inc:
        Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
      BitKeeper/deleted/.del-create_user_no_super.inc:
        Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc
      BitKeeper/deleted/.del-datadict_help_tables_build.result:
        Delete: mysql-test/suite/funcs_1/r/datadict_help_tables_build.result
      BitKeeper/deleted/.del-datadict_help_tables_build.test:
        Delete: mysql-test/suite/funcs_1/t/datadict_help_tables_build.test
      BitKeeper/deleted/.del-datadict_help_tables_dev.result:
        Delete: mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result
      BitKeeper/deleted/.del-datadict_help_tables_dev.test:
        Delete: mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test
      BitKeeper/deleted/.del-datadict_master.inc:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc
      BitKeeper/deleted/.del-datadict_show_schema.inc:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
      BitKeeper/deleted/.del-datadict_show_table_design.inc:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
      BitKeeper/deleted/.del-datadict_tables.inc:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc
      BitKeeper/deleted/.del-datadict_tables_error.inc:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
      BitKeeper/deleted/.del-datadict_tables_error_1.inc:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
      BitKeeper/deleted/.del-datadict_tables_error_1044.inc:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
      BitKeeper/deleted/.del-datadict_tables_error_1049.inc:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
      BitKeeper/deleted/.del-datadict_tables_error_1051.inc:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
      BitKeeper/deleted/.del-datadict_tables_error_1146.inc:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
      BitKeeper/deleted/.del-datadict_tables_error_1288.inc:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
      BitKeeper/deleted/.del-innodb__datadict.result:
        Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result
      BitKeeper/deleted/.del-innodb__datadict.test:
        Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test
      BitKeeper/deleted/.del-memory__datadict.test:
        Delete: mysql-test/suite/funcs_1/t/memory__datadict.test
      BitKeeper/deleted/.del-myisam__datadict.result:
        Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result
      BitKeeper/deleted/.del-myisam__datadict.test:
        Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test
      BitKeeper/deleted/.del-memory__datadict.result:
        Delete: mysql-test/suite/funcs_1/r/memory__datadict.result
      mysql-test/suite/funcs_1/README.txt:
        Cleanup in description
      mysql-test/suite/funcs_1/include/memory_tb1.inc:
        Move setting of variables into the caller scripts
      mysql-test/suite/funcs_1/include/memory_tb2.inc:
        Move setting of variables into the caller scripts
      mysql-test/suite/funcs_1/include/memory_tb3.inc:
        Move setting of variables into the caller scripts
      mysql-test/suite/funcs_1/include/memory_tb4.inc:
        Move setting of variables into the caller scripts
      mysql-test/suite/funcs_1/include/sp_tb.inc:
        Remove outdated comment
      mysql-test/suite/funcs_1/r/innodb_bitdata.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_cursors.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_09.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
        Updated results
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_bitdata.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_cursors.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_0102.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_0407.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_09.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
        Updated results
      mysql-test/suite/funcs_1/r/memory_views.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_bitdata.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_cursors.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_03.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_08.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_09.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
        Updated results
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Updated results
      mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
        Move setting of variables into the caller scripts
      mysql-test/suite/funcs_1/t/innodb_bitdata.test:
        Cleanup
      mysql-test/suite/funcs_1/t/innodb_cursors.test:
        Cleanup
      mysql-test/suite/funcs_1/t/innodb_trig_0102.test:
        Cleanup
      mysql-test/suite/funcs_1/t/innodb_trig_03.test:
        Cleanup
      mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
        Cleanup
      mysql-test/suite/funcs_1/t/innodb_trig_08.test:
        Cleanup
      mysql-test/suite/funcs_1/t/innodb_trig_09.test:
        Cleanup
      mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test:
        Cleanup
      mysql-test/suite/funcs_1/t/innodb_trig_frkey.test:
        Cleanup
      mysql-test/suite/funcs_1/t/innodb_views.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_bitdata.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_cursors.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_trig_0102.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_trig_03.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_trig_0407.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_trig_08.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_trig_09.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_trig_1011ext.test:
        Cleanup
      mysql-test/suite/funcs_1/t/memory_views.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_bitdata.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_cursors.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_trig_0102.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_trig_03.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_trig_0407.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_trig_08.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_trig_09.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
        Cleanup
      mysql-test/suite/funcs_1/t/myisam_views.test:
        Cleanup
      mysql-test/suite/funcs_1/t/charset_collation_1.test:
        Check content of information_schema views
           character_sets, collations,
           collation_character_set_applicability
        Build variant 1
      mysql-test/suite/funcs_1/t/charset_collation_2.test:
        Check content of information_schema views
           character_sets, collations,
           collation_character_set_applicability
        Build variant 2
      mysql-test/suite/funcs_1/t/charset_collation_3.test:
        Check content of information_schema views
           character_sets, collations,
           collation_character_set_applicability
        Build variant 3
      mysql-test/suite/funcs_1/t/is_basics_mixed.test:
        Test some basic properties which are independend of the storage
        engine used for the creation of tables.
      mysql-test/suite/funcs_1/t/is_character_sets.test:
        Tests related to functionality of
        information_schema.character_sets
      mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test:
        Tests related to functionality of
        information_schema.collation_character_set_applicability
      mysql-test/suite/funcs_1/t/is_collations.test:
        Tests related to functionality of
        information_schema.collations
      mysql-test/suite/funcs_1/t/is_column_privileges.test:
        Tests related to functionality of
        information_schema.column_privileges
      mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test:
        Check content of information_schema.column_privileges about databases
        mysql and test
      mysql-test/suite/funcs_1/t/is_columns.test:
        Tests related to functionality of
        information_schema.columns
      mysql-test/suite/funcs_1/t/is_columns_innodb.test:
        Check content of information_schema.columns when some
        tables are preloaded
        Variant for InnoDB
      mysql-test/suite/funcs_1/t/is_columns_is.test:
        Check content of information_schema.columns about schema
        information_schema
      mysql-test/suite/funcs_1/t/is_columns_memory.test:
        Check content of information_schema.columns when some
        tables are preloaded
        Variant for MEMORY
      mysql-test/suite/funcs_1/t/is_columns_myisam.test:
        Check content of information_schema.columns when some
        tables are preloaded
        Variant for MyISAM
      mysql-test/suite/funcs_1/t/is_columns_mysql.test:
        Check content of information_schema.columns about schema
        mysql
      mysql-test/suite/funcs_1/t/is_columns_ndb.test:
        Check content of information_schema.columns when some
        tables are preloaded
        Variant for NDB
      mysql-test/suite/funcs_1/t/is_key_column_usage.test:
        Tests related to functionality of
        information_schema.key_column_usage
      mysql-test/suite/funcs_1/t/is_routines.test:
        Tests related to functionality of
        information_schema.routines
      mysql-test/suite/funcs_1/t/is_schema_privileges.test:
        Tests related to functionality of
        information_schema.schema_privileges
      mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test:
        Check content of information_schema.schema_privileges about schemas
        information_schema, mysql and test
      mysql-test/suite/funcs_1/t/is_schemata.test:
        Tests related to functionality of
        information_schema.schemata
      mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test:
        Check content of information_schema.schemata about schemas
        information_schema, mysql and test
      mysql-test/suite/funcs_1/t/is_statistics.test:
        Tests related to functionality of
        information_schema.statistics
      mysql-test/suite/funcs_1/t/is_statistics_is.test:
        Check content of information_schema.statistics about schema
        information_schema
      mysql-test/suite/funcs_1/t/is_statistics_mysql.test:
        Check content of information_schema.statistics about schema
        mysql
      mysql-test/suite/funcs_1/t/is_table_constraints.test:
        Tests related to functionality of
        information_schema.table_constraints
      mysql-test/suite/funcs_1/t/is_table_constraints_is.test:
        Check content of information_schema.table_constraints about schema
        information_schema
      mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test:
        Check content of information_schema.table_constraints about schema
        mysql
      mysql-test/suite/funcs_1/t/is_table_privileges.test:
        Tests related to functionality of
        information_schema.table_privileges
      mysql-test/suite/funcs_1/datadict/basics_mixed1.inc:
        Auxiliary script
      mysql-test/suite/funcs_1/datadict/basics_mixed2.inc:
        Auxiliary script
      mysql-test/suite/funcs_1/include/cleanup.inc:
        Auxiliary script
      mysql-test/suite/funcs_1/r/charset_collation_1.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/charset_collation_2.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/charset_collation_3.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_basics_mixed.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_character_sets.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_collations.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_column_privileges.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_columns.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_columns_innodb.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_columns_is.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_columns_memory.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_columns_myisam.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_columns_mysql.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_columns_ndb.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_key_column_usage.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_routines.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_schema_privileges.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_schemata.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_statistics.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_statistics_is.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_statistics_mysql.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_table_constraints.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_table_constraints_is.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_table_privileges.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_tables.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_tables_innodb.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_tables_is.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_tables_memory.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_tables_myisam.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_tables_mysql.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_tables_ndb.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_triggers.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_user_privileges.result:
        Expected result for new test
      mysql-test/suite/funcs_1/r/is_views.result:
        Expected result for new test
      mysql-test/suite/funcs_1/t/is_tables.test:
        Tests related to functionality of
        information_schema.tables
      mysql-test/suite/funcs_1/t/is_tables_innodb.test:
        Check content of information_schema.tables when some
        tables are preloaded
        Variant for InnoDB
      mysql-test/suite/funcs_1/t/is_tables_is.test:
        Check content of information_schema.tables about schema
        information_schema
      mysql-test/suite/funcs_1/t/is_tables_memory.test:
        Check content of information_schema.tables when some
        tables are preloaded
        Variant for MEMORY
      mysql-test/suite/funcs_1/t/is_tables_myisam.test:
        Check content of information_schema.tables when some
        tables are preloaded
        Variant for MyISAM
      mysql-test/suite/funcs_1/t/is_tables_mysql.test:
        Check content of information_schema.tables about schema
        mysql
      mysql-test/suite/funcs_1/t/is_tables_ndb.test:
        Check content of information_schema.tables when some
        tables are preloaded
        Variant for NDB
      mysql-test/suite/funcs_1/t/is_triggers.test:
        Tests related to functionality of
        information_schema.triggers
      mysql-test/suite/funcs_1/t/is_user_privileges.test:
        Tests related to functionality of
        information_schema.user_privileges
      mysql-test/suite/funcs_1/t/is_views.test:
        Tests related to functionality of
        information_schema.views
      mysql-test/suite/funcs_1/datadict/basics_mixed3.inc:
        Auxiliary script
      mysql-test/suite/funcs_1/datadict/charset_collation.inc:
        Auxiliary script
      mysql-test/suite/funcs_1/datadict/columns.inc:
        Auxiliary script
      mysql-test/suite/funcs_1/datadict/datadict.pre:
        Auxiliary script
      mysql-test/suite/funcs_1/datadict/is_table_query.inc:
        Auxiliary script
      mysql-test/suite/funcs_1/datadict/statistics.inc:
        Auxiliary script
      mysql-test/suite/funcs_1/datadict/table_constraints.inc:
        Auxiliary script
      mysql-test/suite/funcs_1/datadict/tables1.inc:
        Auxiliary script
      mysql-test/suite/funcs_1/datadict/tables2.inc:
        Auxiliary script
      d6e42aac