into  five.local.lan:/work/trees/mysql-5.0-build-src-clean

- Make sure mysqlhotcopy doesn't create unrestorable slaves.


scripts/mysqlhotcopy.sh:
  Bug #27101 mysqlhotcopy --record_log_pos retrieves wrong slave parameters
  - Record what's been executed by the slave, not what's been delivered.

        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

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged

- Mistaken macro defintions cause mysys to read packets in the wrong order.


include/my_global.h:
  Bug #24992 Enabling Shared Memory support on Windows x64 causes client to fail
  - Use low byte order optimizations for Windows.

must match the order which they were declared in the class definition. 


sql/item.cc:
  Fix initialization order, parameter was the last one declared.

into  alf.(none):/src/macro_bugs/my50-macro_bugs

The problem is that passing anything other than a integer to a limit
clause in a prepared statement would fail. This limitation was introduced
to avoid replication problems (e.g: replicating the statement with a
string argument would cause a parse failure in the slave).

The solution is to convert arguments to the limit clause to a integer
value and use this converted value when persisting the query to the log.


mysql-test/r/limit.result:
  Update test case result.
mysql-test/r/ps.result:
  Add test case result for Bug#33851
mysql-test/r/rpl_user_variables.result:
  Test case result for replication of prepared statement with
  limit clause.
mysql-test/t/limit.test:
  Test parameters to limit clause.
mysql-test/t/ps.test:
  Add test case for Bug#33851
mysql-test/t/rpl_user_variables.test:
  Test replication of a parameter which value is converted.
sql/item.cc:
  Convert value to integer if it's a parameter to a limit clause.
sql/item.h:
  Flag signal that item is a parameter to a limit clause.
sql/item_func.cc:
  Const member functions, object is not mutated.
sql/sql_class.h:
  Const member functions, object is not mutated.
sql/sql_yacc.yy:
  Flag that item is a parameter to a limit clause.

- Remove duplicate macro defintions.


CMakeLists.txt:
  Bug #23839 Multiple declarations of macros
  - Make sure _WIN64 is defined for proper Intellisense functionality.
include/config-win.h:
  Bug #23839 Multiple declarations of macros
  - Remove extra definitions.  Use the my_global.h defines instead.
include/my_global.h:
  Bug #23839 Multiple declarations of macros
  - Slight change to maintain current definitions for Windows.

Disable the test case.


tests/mysql_client_test.c:
  Disable test case.

  Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
misc.m4, character_sets.m4, openssl.m4:
  Removed unneded semicolon


config/ac-macros/character_sets.m4:
  Removed unneded semicolon
config/ac-macros/misc.m4:
  Removed unneded semicolon
config/ac-macros/openssl.m4:
  Removed unneded semicolon
support-files/MacOSX/Info.plist.sh:
  Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
support-files/MacOSX/Makefile.am:
  Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot

into  mysql.com:/home/kent/bk/build/mysql-5.0-build


ndb/src/common/util/SocketServer.cpp:
  Auto merged

  Corrected calculation of version id, incorrect last two digits if < 10
  Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
  RPM spec file
  Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
  Added clear doc how the different version variables differ
SocketServer.cpp:
  Corrected typo in debug error message


ndb/src/common/util/SocketServer.cpp:
  Corrected typo in debug error message
configure.in:
  Corrected calculation of version id, incorrect last two digits if < 10
  Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
  RPM spec file
  Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
  Added clear doc how the different version variables differ

into  quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged


mysql-test/r/view.result:
  Auto merged

into  mysql.com:/home/kent/bk/build/mysql-5.0-build


configure.in:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50


scripts/mysqlhotcopy.sh:
  Auto merged

into  trift2.:/MySQL/M50/push-5.0


ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged

sql/sql_prepare.cc:
  Removed unused variable.

The problem is that CREATE VIEW statements inside prepared statements
weren't being expanded during the prepare phase, which leads to objects
not being allocated in the appropriate memory arenas.

The solution is to perform the validation of CREATE VIEW statements
during the prepare phase of a prepared statement. The validation
during the prepare phase assures that transformations of the parsed
tree will use the permanent arena of the prepared statement.


mysql-test/r/ps.result:
  Add test case result for Bug#32890
mysql-test/t/ps.test:
  Add test case for Bug#32890
sql/item.h:
  Restore original field name if name is auto generated.
sql/sql_prepare.cc:
  Validate and prepare a CREATE VIEW statement for execution.
sql/sql_view.cc:
  Move privileges check to it's own function.
sql/sql_view.h:
  Export function which check privileges of a CREATE VIEW statement.

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build

 - fix test failures that was already there but now are
   more consistent when the 1 second sleep has been removed from
   ndb_waiter


mysql-test/t/ndb_autodiscover.test:
  Wait until mysqld has reconnected to ndbd after ndbd has been restarted
mysql-test/t/ndb_autodiscover3.test:
  Wait until mysqld has reconnected to ndbd after ndbd has been restarted
mysql-test/include/ndb_wait_connected.inc:
  Wait until mysqld has reconnected to ndbd after ndbd has been restarted

a table name.
  
The problem was that fill_defined_view_parts() did not return
an error if a table is going to be altered. That happened if
the table was already in the table cache. In that case,
open_table() returned non-NULL value (valid TABLE-instance from
the cache).
  
The fix is to ensure that an error is thrown even if the table
is in the cache.

(This is a backport of the original patch for 5.1)


mysql-test/r/view.result:
  Fix result file.
mysql-test/r/view_grant.result:
  Fix result file.
mysql-test/t/view.test:
  Add a test case for Bug#34337: Server crash when Altering a view
  using a table name.
mysql-test/t/view_grant.test:
  Fix order-dependency.
sql/sql_view.cc:
  Report an error if we're going to work with a table.

into  wva.:C:/bk/bug31745_2/mysql-5.0-build


sql/sql_parse.cc:
  Auto merged

by patch for bug 32265 .


tests/mysql_client_test.c:
  Removed unused variable.

Executing a prepared statement associated with a materialized
cursor yields to the client a metadata packet with wrong table
and database names. The problem was occurring because the server
was sending the the name of the temporary table used by the cursor
instead of the table name of the original table. The same problem
occurs when selecting from views, in which case the table name was
being sent and not the name of the view.
  
The solution is to fill the list item from the temporary table but
preserving the table and database names of the original fields. This
is achieved by tweaking the Select_materialize to accept a pointer to
the Materialized_cursor class which contains the item list to be filled.


sql/sql_cursor.cc:
  Fill the item list in the send_fields method and preserve
  the table and database name of the fields.
tests/mysql_client_test.c:
  Add test case for Bug#32265

- Replace per-thread signal()'s with  SetUnhandledExceptionFilter(). 
  The only remaining signal() is for SIGABRT (default abort()
  handler in VS2005 is broken, i.e removes user exception filter)
- remove MessageBox()'es  from error handling code
- Windows port for print_stacktrace() and write_core() 
- Cleanup, removed some unused functions


sql/CMakeLists.txt:
  Implement stack tracing on and generating crash dumps on Windows
sql/mysqld.cc:
  Correct signal handling on Windows. 
  - For console events, like CTRL-C use SetConsoleCtrlHandler
  - For exceptions like access violation, use SetUnhandledExceptionFilter
  - For SIGABRT generate exception via __debugbreak() intrinsic
    if built with VS2005 and later , since default SIGABRT handler 
    replaces unhandled exception filter specified by user
  - make provisions to debug exception filter, as it is not trivial 
  (should be compiled with /DDEBUG_UNHANDLED_EXCEPTION_FILTER)
sql/sql_parse.cc:
  Remove message box from windows signal handler.
  The only thread specific handler left is for SIGABRT,
  which is broken on VS2005 and later (user specified unhandled exception 
  filter gets overwritten)
sql/stacktrace.c:
  Stack tracing and generating crash dumps on Windows
sql/stacktrace.h:
  Implement print_stacktrace and write_core on Windows

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50

Check for an existing MySQL server package from a different vendor or
major MySQL version.  In such a case, refuse to install the server and
recommend how to safely remove the old packages before installing the
new ones.


support-files/mysql.spec.sh:
  Add to the %pre server scriptlet checks to ensure that we're not
  upgrading from another vendor's package, or that this is not a
  major version upgrade.  If an automatic upgrade isn't safe, print
  basic instructions on how to do a manual upgrade, and bail out.

Remove code from mysqlhotcopy which deals with the so-called "RAID"
feature of older MyISAM.


scripts/mysqlhotcopy.sh:
  Remove code which tried to handle the so-called "RAID" files.
  
  The "RAID" feature has been dropped from MySQL builds, and this
  code caused mysqlhotcopy to skip (silently) over databases with
  two-character names (e.g., "ab").

Add -lmygcc to mysql_config output for libs, libs_r, and embedded_libs.

Required when linking against our static libs, if yassl is used, and gcc
used to build library is significantly different from that which is using
the library.


scripts/mysql_config.sh:
  Add -lmygcc to --libs, --libs_r, and --embedded-libs output, if libmygcc.a
  is found in the pkglibdir.
  
  This works around a problem when linking against the static client
  libs which were built with a different GCC than the current compiler.
  In this case, without -lmygcc, several builtin functions (e.g.,
  __pure_virtual, __builtin_delete) are left undefined.  Currently it
  is yassl which pulls in these symbols.
  
  This isn't a problem when linking against shared libraries, or when
  using the same compiler version.
  
  Currently it shows up with libs built on build.mysql.com with gcc 2.95.3,
  when using them on more recent systems.
  
  
  Also strip the -mcpu, -mtune, and -march cflags.  The calling package can
  determine what optimization parameters to choose.

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  SCCS merged

into  trift2.:/MySQL/M50/push-5.0

into  mysql.com:/home/kent/bk/build/mysql-5.0-build


configure.in:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge