into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/r/sp.result:
  Use local
client/mysqltest.c:
  Manual merge
mysql-test/lib/mtr_report.pl:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  SCCS merged

 - Move the code to generate test report to the test tool(in this
   case mysqltest) where the best control of what failed is
- Simplify the code in mysql-test-run.pl
- mysqltest will now find what diff to use in a best effort attempt
  using "diff -u", "diff -c" and finally dumping the two files verbatim
  in the report.


client/mysqltest.c:
  - Add new option --tail-lines indicating how many lines of the result to output
    when generating report for a failure
  - Remove eval_result, noone knows what it should do and it's not used.
  - Add support for best effort execution of systems builtin "diff",
    try with "diff -u" and "diff -c" and if that fails dump the whole content
     of teh two files to report
  - Use one common function when comapring two files, used when test 
    has completed and the result should be compared to the .result file
    as well as using it from myqltest's builtin diff_files command.
  - Output the last lines og the result so far  in the report that mysqltest
    generates in case of a test failure.
mysql-test/lib/mtr_report.pl:
  - Remove code for generating diff between .reject and .result file,
    that is handled by mysqltest(or the test tool) from now on.
  - Add better comments
mysql-test/mysql-test-run.pl:
  - Remove the --udiff flag to mysql-test-run.pl, if the systems diff supports
    unified diff it will be used automatically
  - Remove the code for "mtr_show_failed_diff", the report from mysqltest
    will know include the diff so if mysqltest(or another test tool)
    fails, just display it's report what went wrong
  - Pass --tail-lines=20 to mysqltest to it will shos the last 20 lines 
    from the result in the report in case of failure.	
mysql-test/r/mysqltest.result:
  Update result file now when the output from mysqltest has been sent to /dev/null
mysql-test/t/mysqltest.test:
  - Improve tests for --diff_files
  - Remove temporary files in var/tmp generated in the fly
  - Send output from test for --diff_files to /deb/null since only the error
    code it returns are of interest and tyhe outpu may vary depending
    on what builtin diff is being used.

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged

mysql-test/r/sp.result:
  Cleanup created procedures
mysql-test/t/sp.test:
  Cleanup created procedures

client/mysql_upgrade.c:
  Remove the temporary file after it's been used

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Merge

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged

Define tot_real_tim locally in mtr_report.pl


mysql-test/mysql-test-run.pl:
  Move global variable to local scope in the file it's being used

of mysql-test-run.pl


mysql-test/lib/mtr_process.pl:
  Change from "print" to "mtr_debug" to get messages logged to file as well
mysql-test/lib/mtr_report.pl:
  - Add "mtr_log_init" function used for opening the log file
  - Change from "print" to "mtr_report" to get the messages logged
  - Make printout functions log to the log file
mysql-test/mysql-test-run.pl:
  - Open the mysql-test-run log file as soon as var/log has been created
  - Change from "print" to "mtr_report" to get the messgages to log as well

into  mysql.com:/home/ram/work/b30088/b30088.5.0


mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged

into  mysql.com:/home/ram/work/b30088/b30088.5.1


sql/mysqld.cc:
  Auto merged
mysql-test/t/show_check.test:
  SCCS merged

into  mysql.com:/home/ram/work/b30200/b30200.5.1


sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/item_create.cc:
  manual merge.

Problem: thd->thread_specific_used flag is not set executing a statement
containig connection_id() function using PS protocol, that leads to 
improper binlog event creation.

Fix: set the flag in the Item_func_connection_id::fix_fields().


sql/item_create.cc:
  Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
    - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields()
      to have it properly set using PS protocol as well.
sql/item_func.cc:
  Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
    - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields()
      to have it properly set using PS protocol as well.
sql/sql_parse.cc:
  Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
    - reset the thd->thread_specific_used flag in the mysql_reset_thd_for_next_command().

compatibility hook, thd_mark_transaction_to_rollback().


mysql-test/r/ps.result:
  Post-merge fix.   Changes for WL 3984 (Revise locking
  of mysql.general_log and mysql.slow_log) cause some test
  result differences.
mysql-test/r/show_check.result:
  Post-merge fix.   Changes for WL 3984 (Revise locking
  of mysql.general_log and mysql.slow_log) cause some test
  result differences.
sql/sql_class.cc:
  Post-merge fix, add InnoDB compatibility hook (defined for
  InnoDB only), thd_mark_transaction_to_rollback().
storage/innobase/handler/ha_innodb.cc:
  Post-merge fix, add InnoDB compatibility hook (defined for
  InnoDB only), thd_mark_transaction_to_rollback().
storage/innobase/handler/ha_innodb.h:
  Post-merge fix, add InnoDB compatibility hook (defined for
  InnoDB only), thd_mark_transaction_to_rollback().

sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_rcontext.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/include/read_many_rows.inc:
  Manual merge
mysql-test/r/read_many_rows_innodb.result:
  Manual merge
sql/sql_class.cc:
  Manual merge
sql/sql_class.h:
  Manual merge
storage/innobase/handler/ha_innodb.cc:
  Manual merge

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

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


mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged

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


sql/handler.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41

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


configure.in:
  Auto merged

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

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


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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


configure.in:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41

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


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
mysql-test/include/mix1.inc:
  SCCS merged
mysql-test/r/innodb_mysql.result:
  use local

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

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


mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

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


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41

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

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


configure.in:
  Auto merged

Marko after applying latest snapshot).


storage/innobase/handler/ha_innodb.cc:
  Remove redundant assignment to thd_to_trx(thd); trx is
  declared as a reference to thd_to_trx(thd) at the top
  of the function, so this assignment isn't useful.
storage/innobase/include/trx0trx.h:
  Remove two unused members from struct trx_struct.  allow_duplicates
  and replace_duplicates are not used; a single duplicates member is
  used instead to represent both flags.

sql/sql_class.cc:
  Fix a valgrind warning (row_count_func is used before it was initialized
  in SQLCOM_CALL)

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

into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.0

  - THD::tmp_table_used removed, THD::thread_specific_used used instead.

The files below "mysql-test/suite/funcs_2" in version 5.1
did not depend on the equivalent ones in 5.0,
probably because they had been checked in independent of each other
in both versions.

Foreach file F in the suite that has a "deleted" counterpart D, use
    bk rm $F
    bk mv $D $F
    bk edit $F
to get those files into the 5.1 suite that (for BK) depend on 5.0.

There is only one file whose contents differs between 5.0 and 5.1,
restore its current 5.1 contents:
   mysql-test/suite/funcs_2/r/ndb_charset.result


BitKeeper/deleted/.del-charset_master.test~3ac6827798431a7:
  Delete: mysql-test/suite/funcs_2/charset/charset_master.test
mysql-test/suite/funcs_2/charset/charset_master.test:
  Rename: BitKeeper/deleted/.del-charset_master.test -> mysql-test/suite/funcs_2/charset/charset_master.test
BitKeeper/deleted/.del-charset_utf8.txt~c8409ddc3d216d4:
  Delete: mysql-test/suite/funcs_2/data/charset_utf8.txt
BitKeeper/deleted/.del-check_charset.inc~1328722ebe51ab2b:
  Delete: mysql-test/suite/funcs_2/include/check_charset.inc
mysql-test/suite/funcs_2/data/charset_utf8.txt:
  Rename: BitKeeper/deleted/.del-charset_utf8.txt -> mysql-test/suite/funcs_2/data/charset_utf8.txt
mysql-test/suite/funcs_2/include/check_charset.inc:
  Rename: BitKeeper/deleted/.del-check_charset.inc -> mysql-test/suite/funcs_2/include/check_charset.inc
BitKeeper/deleted/.del-check_charset_ucs2.inc~fbcdbb34f38ce9f1:
  Delete: mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
BitKeeper/deleted/.del-check_charset_utf8.inc~703a0b77d86f514e:
  Delete: mysql-test/suite/funcs_2/include/check_charset_utf8.inc
BitKeeper/deleted/.del-gen_charset_utf8.pl~ff00332572f0f0b6:
  Delete: mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
mysql-test/suite/funcs_2/include/check_charset_ucs2.inc:
  Rename: BitKeeper/deleted/.del-check_charset_ucs2.inc -> mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
mysql-test/suite/funcs_2/include/check_charset_utf8.inc:
  Rename: BitKeeper/deleted/.del-check_charset_utf8.inc -> mysql-test/suite/funcs_2/include/check_charset_utf8.inc
BitKeeper/deleted/.del-innodb_charset.result~5a9b45c455263e16:
  Delete: mysql-test/suite/funcs_2/r/innodb_charset.result
BitKeeper/deleted/.del-memory_charset.result~3e27ebf0471b3472:
  Delete: mysql-test/suite/funcs_2/r/memory_charset.result
mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl:
  Rename: BitKeeper/deleted/.del-gen_charset_utf8.pl -> mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
mysql-test/suite/funcs_2/r/innodb_charset.result:
  Rename: BitKeeper/deleted/.del-innodb_charset.result -> mysql-test/suite/funcs_2/r/innodb_charset.result
BitKeeper/deleted/.del-myisam_charset.result~e86d46123a579771:
  Delete: mysql-test/suite/funcs_2/r/myisam_charset.result
BitKeeper/deleted/.del-ndb_charset.result~37be292ee7801689:
  Delete: mysql-test/suite/funcs_2/r/ndb_charset.result
mysql-test/suite/funcs_2/r/memory_charset.result:
  Rename: BitKeeper/deleted/.del-memory_charset.result -> mysql-test/suite/funcs_2/r/memory_charset.result
mysql-test/suite/funcs_2/r/myisam_charset.result:
  Rename: BitKeeper/deleted/.del-myisam_charset.result -> mysql-test/suite/funcs_2/r/myisam_charset.result
BitKeeper/deleted/.del-innodb_charset.test~4555b7e4a5caa39:
  Delete: mysql-test/suite/funcs_2/t/innodb_charset.test
BitKeeper/deleted/.del-memory_charset.test~4f055ebb453f58fd:
  Delete: mysql-test/suite/funcs_2/t/memory_charset.test
BitKeeper/deleted/.del-myisam_charset.test~f859c5b56700de58:
  Delete: mysql-test/suite/funcs_2/t/myisam_charset.test
mysql-test/suite/funcs_2/t/innodb_charset.test:
  Rename: BitKeeper/deleted/.del-innodb_charset.test -> mysql-test/suite/funcs_2/t/innodb_charset.test
mysql-test/suite/funcs_2/t/memory_charset.test:
  Rename: BitKeeper/deleted/.del-memory_charset.test -> mysql-test/suite/funcs_2/t/memory_charset.test
mysql-test/suite/funcs_2/t/myisam_charset.test:
  Rename: BitKeeper/deleted/.del-myisam_charset.test -> mysql-test/suite/funcs_2/t/myisam_charset.test
BitKeeper/deleted/.del-ndb_charset.test~354cbaeb1bc2f75d:
  Delete: mysql-test/suite/funcs_2/t/ndb_charset.test
BitKeeper/deleted/.del-readme.txt~e8399f1a3f34d433:
  Delete: mysql-test/suite/funcs_2/readme.txt
mysql-test/suite/funcs_2/readme.txt:
  Rename: BitKeeper/deleted/.del-readme.txt~2 -> mysql-test/suite/funcs_2/readme.txt
mysql-test/suite/funcs_2/t/ndb_charset.test:
  Rename: BitKeeper/deleted/.del-ndb_charset.test -> mysql-test/suite/funcs_2/t/ndb_charset.test
mysql-test/suite/funcs_2/r/ndb_charset.result:
  Fix a bad BitKeeper dependency structure for the "funcs_2" suite:
  
  Restore the 5.1 contents into the 5.0-dependent file.