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

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


scripts/make_win_bin_dist:
  Auto merged

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


client/mysqldump.c:
  Auto merged

into  trift2.:/MySQL/M41/push-4.1

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build

  
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.


tests/mysql_client_test.c:
  Disable test case.

	databases from 4.0 server

mysqldump treated a failure to set the results charset as a severe
error.  

Now, don't try to set the charset for the SHOW CREATE TABLE statement,
if remote server's version is earlier than 4.1, which means it 
doesn't support changing charsets.


client/mysqldump.c:
  Don't set the charset for receiving results if the server doesn't 
  support it.

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

into  kaamos.(none):/data/src/opt/mysql-5.0-opt

into  kaamos.(none):/data/src/opt/mysql-5.0-opt


client/mysql.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.

into  kaamos.(none):/data/src/opt/mysql-4.1-opt

WL#4203 Reorganize and fix the data dictionary tests of
        testsuite funcs_1
because the goal to fix
Bug#34532 Some funcs_1 tests do not clean up at end of testing
was partially missed.
Some minor additional modifications are for
   WL#4304 Cleanup in funcs_1 tests


BitKeeper/deleted/.del-innodb_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/innodb_triggers.result -> BitKeeper/deleted/.del-innodb_triggers.result
BitKeeper/deleted/.del-memory_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/memory_triggers.result -> BitKeeper/deleted/.del-memory_triggers.result
BitKeeper/deleted/.del-myisam_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/myisam_triggers.result -> BitKeeper/deleted/.del-myisam_triggers.result
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/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_07.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/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/cursors/cursors_master.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Cleanup
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.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_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/views/views_master.inc:
  Backport of file in 5.1 which got many fixes for instabilities
  and other improvements

  Include .pdb files for tools and libraries (bug#35104)


scripts/make_win_bin_dist:
  Include .pdb files for tools and libraries (bug#35104)

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

into  mysql.com:/misc/mysql/34749/50-34749


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged

into  mysql.com:/misc/mysql/29645/50-29645

into  kaamos.(none):/data/src/opt/mysql-5.0-opt

- 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  magare.gmz:/home/kgeorge/mysql/autopush/B34909-5.0-opt

  --master-data

No error code was returned by mysqldump if it detects that binary
logging is not enabled on the server.
Fixed by returning error code.


client/mysqldump.c:
  Bug #34909: add error code
mysql-test/r/mysqldump-no-binlog.result:
  Bug #34909: test case
mysql-test/t/mysqldump-no-binlog-master.opt:
  Bug #34909: test case
mysql-test/t/mysqldump-no-binlog.test:
  Bug #34909: test case

into  mysql.com:/home/psergey/mysql-5.0-bug34945

                    sporadically

Under some circumstances, the mysql_insert_id() value after SELECT ...
INSERT could return a wrong value. This could happen when the last
SELECT ... INSERT did not involve an AUTO_INCREMENT column, but the
value of mysql_insert_id() was changed by some previous statements.

Fixed by checking the value of thd->insert_id_used in
select_insert::send_eof() and returning 0 for mysql_insert_id() if it
is not set.


sql/sql_insert.cc:
  Do not return thd->last_insert_id unconditionally in
  select_insert::send_eof(). First check if thd->insert_id_used is
  non-zero, and return 0 otherwise.
tests/mysql_client_test.c:
  Added a test case for bug #34889.

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


configure.in:
  Auto merged

scripts/CMakeLists.txt:
  Treat "mysql_upgrade_shell" the same way as all the other scripts.

- Apply Eric Bergen's patch: in join_read_always_key(), move ha_index_init() call
  to before the late NULLs filtering code.
- Backport function comments from 6.0.


mysql-test/r/null_key.result:
  BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql"
  - Testcase
mysql-test/t/null_key.test:
  BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql"
  - Testcase
sql/sql_select.cc:
  BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql"
  - Apply Eric Bergen's patch: in join_read_always_key(), move ha_index_init() call
    to before the late NULLs filtering code.
  - Backport function comments from 6.0

into  kaamos.(none):/data/src/opt/mysql-5.0-opt

                    with errno 17

my_create() did not perform any checks for the case when a file is
successfully created by a call to open(), but the call to
my_register_filename() later fails because the number of open files
has exceeded the my_open_files limit. This can happen on platforms 
which do not have getrlimit(), and hence we do not know the real limit
for open files. In such a case an error was returned to a caller
although the file has actually been created. Since callers assume
my_create() to return an error only when it failed to create a file,
they did not perform any cleanups, leaving an 'orphaned' file on the
file system.

Fixed by adding a check for the above case to my_create() and ensuring
the newly created file is deleted before returning an error.

Creating a deterministic test case in the test suite is impossible,
because the exact steps required to reproduce the above situation
depend on the platform and/or environment (OS per-user limits, queries
executed by previous tests, startup parameters). The patch was
manually tested on Windows using examples posted in the bug report.


mysys/my_create.c:
  Ensure that, if the call to my_register_filename() in my_create()
  failed, but the previous open() called succeeded, the newly created
  file is deleted before returning an error.

into  host.loc:/home/uchum/work/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


mysql-test/t/symlink.test:
  Auto merged
mysql-test/r/symlink.result:
  after merge fix

mysql-test/r/symlink.result:
  result fix

                  and Item_direct_ref constructor calls.

Order of ref->field_name and ref->table_name arguments
is of Item_ref and Item_direct_ref in the fix_inner_refs
function is inverted.


sql/sql_select.cc:
  Fixed bug #34830: mixed table and field names in Item_ref
                    and Item_direct_ref constructor calls.
  
  Order of ref->field_name and ref->table_name arguments
  is of Item_ref and Item_direct_ref in the fix_inner_refs
  function is inverted. See definitions:
  
    Item_ref(Name_resolution_context *context_arg, Item **item,
             const char *table_name_arg, const char *field_name_arg,
             bool alias_name_used_arg= FALSE)
    and
  
    Item_direct_ref(Name_resolution_context *context_arg, Item **item,
                    const char *table_name_arg,
                    const char *field_name_arg,
                    bool alias_name_used_arg= FALSE)

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


sql/mysql_priv.h:
  Auto merged
mysql-test/r/symlink.result:
  manual merge
mysql-test/t/symlink.test:
  manual merge
sql/mysqld.cc:
  manual merge
sql/sql_parse.cc:
  manual merge

added new function test_if_data_home_dir() which checks that
path does not contain mysql data home directory.
Using of mysql data home directory in
DATA DIRECTORY & INDEX DIRECTORY is disallowed.


mysql-test/r/symlink.result:
  test result
mysql-test/t/symlink.test:
  test case
sql/mysql_priv.h:
  new variable mysql_unpacked_real_data_home
sql/mysqld.cc:
  new variable mysql_unpacked_real_data_home
sql/sql_parse.cc:
  added new function test_if_data_home_dir() which checks that
  path does not contain mysql data home directory.
  Using of mysql data home directory in
  DATA DIRECTORY & INDEX DIRECTORY is disallowed.