into  five.local.lan:/work/merge/mysql-5.1-build-31610


mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Auto merged

   Bug#31567 "datadict" tests (all engines) fail:
             Reference protocol is non-standard build
   Bug#30418 "datadict" tests (all engines) fail:
             Dependency on the host name for ordering   
Modifications:
   1. The standard builds (build team) do not contain
      the collation 'utf8_general_cs'.
      The common developer builds (compuile-....-max)
      contain this collation.
      Solution fitting to both build variants:
         Exclude the collation 'utf8_general_cs' from
         result sets.
   2. Use mysqltest builtin sorting of result set for
      the statement where the hostname affects the
      row order.


mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Exclude collation 'utf8_general_cs' from result set.
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  Use mysqltest builtin sorting of result set.
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Exclude collation 'utf8_general_cs' from result set.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated  results
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated  results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated  results

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


client/mysql.cc:
  Auto merged

In several cases, an error when processing the query would cause mysql to
return to the top level without printing warnings.  Fix is to always
print any available warnings before returning to the top level.


client/mysql.cc:
  In com_go(), ensure that warnings are printed even if an error
  occurred when processing the query.  Before this patch, an error
  in several places would return to the top level without printing
  associated warnings.
  
  Attempt to avoid printing the warning, though, if it's a duplicate
  of mysql_error() for the connection handle.
mysql-test/r/mysql.result:
  Add test for bug 25146
mysql-test/t/mysql.test:
  Add test for bug 25146

mysql-test/lib/mtr_report.pl:
  Update 'allowed errors' list to match re-formatted InnoDB error message.

Fixes the following bug:

- Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase

  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.


storage/innobase/dict/dict0dict.c:
  Applied InnoDB snapshot innodb-5.1-ss2093
  
  Revision r2092:
  Remove the unused function innobase_convert_from_filename() that was
  inadvertently added in r590.
storage/innobase/handler/ha_innodb.cc:
  Applied InnoDB snapshot innodb-5.1-ss2093
  
  Revision r2088:
  Fix Bug#32125 (http://bugs.mysql.com/32125)
  "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
  
  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.
  
  Approved by:	Heikki (via IM)
  
  
  
  Revision r2093:
  convert_search_mode_to_innobase(): Add the missing case label
  HA_READ_MBR_EQUAL that was forgotten in r2088.
  
  
  Revision r2089:
  Non-functional change: convert the switch in convert_search_mode_to_innobase()
  to the InnoDB coding style.
  
  
  Revision r2092:
  Remove the unused function innobase_convert_from_filename() that was
  inadvertently added in r590.
storage/innobase/include/page0cur.h:
  Applied InnoDB snapshot innodb-5.1-ss2093
  
  Revision r2088:
  Fix Bug#32125 (http://bugs.mysql.com/32125)
  "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
  
  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.
  
  Approved by:	Heikki (via IM)

into  ramayana.hindu.god:/home/tsmith/m/inno/nov19/51

into  ramayana.hindu.god:/home/tsmith/m/inno/nov19/51


storage/innobase/handler/ha_innodb.cc:
  Use local (null merge)
storage/innobase/include/db0err.h:
  Use local (null merge)
storage/innobase/include/os0sync.h:
  Use local (null merge)
storage/innobase/include/page0cur.h:
  Use local (null merge)
storage/innobase/include/sync0rw.h:
  Use local (null merge)
storage/innobase/include/sync0rw.ic:
  Use local (null merge)
storage/innobase/include/sync0sync.ic:
  Use local (null merge)
storage/innobase/os/os0sync.c:
  Use local (null merge)
storage/innobase/srv/srv0srv.c:
  Use local (null merge)
storage/innobase/sync/sync0arr.c:
  Use local (null merge)
storage/innobase/sync/sync0rw.c:
  Use local (null merge)
storage/innobase/sync/sync0sync.c:
  Use local (null merge)

Fixes the following bugs:

- Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'

  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.

- Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase

  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.


innobase/include/db0err.h:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2091:
  branches/5.0:
   
  Merge r2088 from trunk:
   
  log for r2088:
  
  Fix Bug#32125 (http://bugs.mysql.com/32125)
  "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
  
  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.
  
  Approved by:	Heikki
innobase/include/os0sync.h:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2082:
  branches/5.0:  bug#29560
  
  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.
  
  Reviewed by: Heikki
innobase/include/page0cur.h:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2091:
  branches/5.0:
   
  Merge r2088 from trunk:
   
  log for r2088:
  
  Fix Bug#32125 (http://bugs.mysql.com/32125)
  "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
  
  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.
  
  Approved by:	Heikki
innobase/include/sync0rw.h:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2082:
  branches/5.0:  bug#29560
  
  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.
  
  Reviewed by: Heikki
innobase/include/sync0rw.ic:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2082:
  branches/5.0:  bug#29560
  
  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.
  
  Reviewed by: Heikki
innobase/include/sync0sync.ic:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2082:
  branches/5.0:  bug#29560
  
  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.
  
  Reviewed by: Heikki
innobase/os/os0sync.c:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2082:
  branches/5.0:  bug#29560
  
  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.
  
  Reviewed by: Heikki
innobase/srv/srv0srv.c:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2082:
  branches/5.0:  bug#29560
  
  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.
  
  Reviewed by: Heikki
innobase/sync/sync0arr.c:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2082:
  branches/5.0:  bug#29560
  
  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.
  
  Reviewed by: Heikki
innobase/sync/sync0rw.c:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2082:
  branches/5.0:  bug#29560
  
  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.
  
  Reviewed by: Heikki
innobase/sync/sync0sync.c:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2082:
  branches/5.0:  bug#29560
  
  Fixed a race condition in the rw_lock where an os_event_reset()
  can overwrite an earlier os_event_set() triggering an indefinite
  wait.
  NOTE: This fix for windows is different from that for other platforms.
  NOTE2: This bug is introduced in the scalability fix to the
  sync0arr which was applied to 5.0 only. Therefore, it need not be
  applied to the 5.1 tree. If we decide to port the scalability fix
  to 5.1 then this fix should be ported as well.
  
  Reviewed by: Heikki
sql/ha_innodb.cc:
  Applied InnoDB snapshot innodb-5.0-ss2095
  
  Revision r2091:
  branches/5.0:
   
  Merge r2088 from trunk:
   
  log for r2088:
  
  Fix Bug#32125 (http://bugs.mysql.com/32125)
  "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
  
  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.
  
  Approved by:	Heikki
  
  
  Revision r2095:
  branches/5.0: Merge r2093 from trunk:
  
  convert_search_mode_to_innobase(): Add the missing case label
  HA_READ_MBR_EQUAL that was forgotten in r2088.

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

into  mysql.com:/home/kent/bk/tmpmerge/mysql-5.1-build

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

       Bug#31610 Remove outdated and redundant tests:
                 partition_02myisam partition_03ndb
       Bug#32405 testsuite parts: partition_char_myisam wrong content
and cleanup of testsuite
   - remove/correct wrong comments
   - remove workarounds for fixed bugs
   - replace error numbers with error names
   - exclude subtests from execution which fail now because of
     new limitations for partitioning functions
   - remove code for the no more intended dual use
     fast test in regression tests/slow test in testsuite
   - analyze and fix problems with partition_char_innodb
   - fix problems caused by last change of error numbers
   - Introduce error name to error number mapping which makes
     maintenance after next error renumbering easier


BitKeeper/deleted/.del-partition_03ndb.result:
  Rename: mysql-test/suite/ndb/r/partition_03ndb.result -> BitKeeper/deleted/.del-partition_03ndb.result
BitKeeper/deleted/.del-partition_03ndb.test:
  Rename: mysql-test/suite/ndb/t/partition_03ndb.test -> BitKeeper/deleted/.del-partition_03ndb.test
BitKeeper/deleted/.del-partition_1.inc:
  Rename: mysql-test/include/partition_1.inc -> BitKeeper/deleted/.del-partition_1.inc
BitKeeper/deleted/.del-partition_02myisam.result:
  Rename: mysql-test/r/partition_02myisam.result -> BitKeeper/deleted/.del-partition_02myisam.result
BitKeeper/deleted/.del-partition_02myisam.test:
  Rename: mysql-test/t/partition_02myisam.test -> BitKeeper/deleted/.del-partition_02myisam.test
BitKeeper/deleted/.del-partition_char_myisam.result:
  Rename: mysql-test/suite/parts/r/partition_char_myisam.result -> BitKeeper/deleted/.del-partition_char_myisam.result
mysql-test/suite/parts/inc/methods1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition.pre:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_10.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_11.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_12.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_20.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter3.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter4.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_11.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_13.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_41.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_basic.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_binary.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_bit.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_blob.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_char.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_check.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_drop.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_read.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_read1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_read2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_cleanup.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_directory.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_engine.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_enum.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_layout.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_layout_check1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_layout_check2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_methods1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_methods2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_set.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_syntax.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_syntax_1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_syntax_2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_text.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_trigg1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_trigg2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_trigg3.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_value.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_varbinary.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_varchar.inc:
  Fixes + cleanup
mysql-test/suite/parts/r/partition_alter1_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_alter1_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_alter2_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_alter2_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_alter3_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_alter3_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_alter4_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_alter4_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_bit_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_char_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_datetime_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_decimal_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_engine_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_engine_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_float_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_float_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_int_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_special_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_syntax_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_syntax_myisam.result:
  Updated result
mysql-test/suite/parts/t/disabled.def:
  Fixes + cleanup
mysql-test/suite/parts/t/part_blocked_sql_func_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/part_blocked_sql_func_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/part_supported_sql_func_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/part_supported_sql_func_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/part_supported_sql_func_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter1_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter1_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter1_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter2_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter2_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter2_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter3_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter3_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter4_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter4_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_basic_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_basic_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_basic_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_bit_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_bit_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_bit_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_char_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_char_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_datetime_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_datetime_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_decimal_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_decimal_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_engine_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_engine_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_engine_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_float_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_float_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_int_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_int_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_int_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_special_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_special_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_syntax_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_syntax_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_syntax_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_value_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_value_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_value_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/r/partition_char_myisam.result:
  Updated result
  bk rm + new file is caused by bk complaining about filetype

into  trift2.:/MySQL/M51/push-5.1

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


mysys/default.c:
  Auto merged

this must be reflected in the test result files.


mysql-test/suite/funcs_1/r/ndb_cursors.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
  Error number changed, adapt the test result.
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
  Error number changed, adapt the test result.

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

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-18431


cmd-line-utils/readline/bind.c:
  Auto merged
cmd-line-utils/readline/complete.c:
  Auto merged
cmd-line-utils/readline/display.c:
  Auto merged
cmd-line-utils/readline/histfile.c:
  Auto merged
cmd-line-utils/readline/rltty.c:
  Auto merged
cmd-line-utils/readline/undo.c:
  Auto merged
cmd-line-utils/readline/xmalloc.c:
  Auto merged

cmd-line-utils/readline/INSTALL:
  update readline to version 5.2
cmd-line-utils/readline/README:
  update readline to version 5.2
cmd-line-utils/readline/bind.c:
  update readline to version 5.2
cmd-line-utils/readline/callback.c:
  update readline to version 5.2
cmd-line-utils/readline/chardefs.h:
  update readline to version 5.2
cmd-line-utils/readline/compat.c:
  update readline to version 5.2
cmd-line-utils/readline/complete.c:
  update readline to version 5.2
cmd-line-utils/readline/configure.in:
  update readline to version 5.2
cmd-line-utils/readline/display.c:
  update readline to version 5.2
cmd-line-utils/readline/funmap.c:
  update readline to version 5.2
cmd-line-utils/readline/histexpand.c:
  update readline to version 5.2
cmd-line-utils/readline/histfile.c:
  update readline to version 5.2
cmd-line-utils/readline/history.c:
  update readline to version 5.2
cmd-line-utils/readline/histsearch.c:
  update readline to version 5.2
cmd-line-utils/readline/input.c:
  update readline to version 5.2
cmd-line-utils/readline/isearch.c:
  update readline to version 5.2
cmd-line-utils/readline/keymaps.c:
  update readline to version 5.2
cmd-line-utils/readline/kill.c:
  update readline to version 5.2
cmd-line-utils/readline/macro.c:
  update readline to version 5.2
cmd-line-utils/readline/mbutil.c:
  update readline to version 5.2
cmd-line-utils/readline/misc.c:
  update readline to version 5.2
cmd-line-utils/readline/nls.c:
  update readline to version 5.2
cmd-line-utils/readline/parens.c:
  update readline to version 5.2
cmd-line-utils/readline/readline.c:
  update readline to version 5.2
cmd-line-utils/readline/readline.h:
  update readline to version 5.2
cmd-line-utils/readline/rlconf.h:
  update readline to version 5.2
cmd-line-utils/readline/rldefs.h:
  update readline to version 5.2
cmd-line-utils/readline/rlmbutil.h:
  update readline to version 5.2
cmd-line-utils/readline/rlprivate.h:
  update readline to version 5.2
cmd-line-utils/readline/rltty.c:
  update readline to version 5.2
cmd-line-utils/readline/savestring.c:
  update readline to version 5.2
cmd-line-utils/readline/search.c:
  update readline to version 5.2
cmd-line-utils/readline/shell.c:
  update readline to version 5.2
cmd-line-utils/readline/signals.c:
  update readline to version 5.2
cmd-line-utils/readline/terminal.c:
  update readline to version 5.2
cmd-line-utils/readline/text.c:
  update readline to version 5.2
cmd-line-utils/readline/tilde.c:
  update readline to version 5.2
cmd-line-utils/readline/tilde.h:
  update readline to version 5.2
cmd-line-utils/readline/undo.c:
  update readline to version 5.2
cmd-line-utils/readline/util.c:
  update readline to version 5.2
cmd-line-utils/readline/vi_keymap.c:
  update readline to version 5.2
cmd-line-utils/readline/vi_mode.c:
  update readline to version 5.2
cmd-line-utils/readline/xmalloc.c:
  update readline to version 5.2

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

into  trift2.:/MySQL/M51/push-5.1


support-files/mysql.spec.sh:
  Null-merge the "make test-bt-debug" from 5.0 to 5.1,
  because 5.1 already does it "the right way".

In the "spec" file for RPM builds, handle the debug server tests different from the standard server.


support-files/mysql.spec.sh:
  Don't use the "test-bt" target to run the tests on the debug server,
  rather use "test-bt-debug".
  
  There are two reasons for this:
  1) Consistency with the "tar.gz" builds.
  2) The tool that evaluates the build logs needs unique "--comment=" options in the log,
     or else it will fail when it generates the test status summary.

into  trift2.:/MySQL/M51/push-5.1

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

into  trift2.:/MySQL/M51/push-5.1

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

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

into  mysql.com:/misc/mysql/31700/51-31700


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

tests adjusted for Windows


mysql-test/r/log_tables.result:
  Be more conservative in tests (for Windows)
mysql-test/t/log_tables.test:
  Be more conservative in tests (for Windows)

into  trift2.:/MySQL/M51/push-5.1


include/my_sys.h:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1


include/my_sys.h:
  Auto merged
sql/CMakeLists.txt:
  Manual merge: Keep the workaround for the cmake 2.4.6 bug, enclose it in "if".

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


mysql-test/t/select.test:
  Auto merged