into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137

mysql-test/t/rpl_trunc_temp.test:
  Remove final "connection master" it's already disconnected

into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137


sql/sql_delete.cc:
  Auto merged

 - Decrease "slave_open_temp_tables" during reopen of truncated table.
 - Add test "rpl_trunc_temp" 


sql/sql_delete.cc:
  Decrease "slave_open_temp_tables" after temporary table has been closed, it will be
  increased again when the temp table is reopened after it's been truncated.
mysql-test/r/rpl_trunc_temp.result:
  New BitKeeper file ``mysql-test/r/rpl_trunc_temp.result''
mysql-test/t/rpl_trunc_temp.test:
  New BitKeeper file ``mysql-test/t/rpl_trunc_temp.test''

only its own tables to prevent getting tables from others.


mysql-test/r/rpl_trigger.result:
  Update the result file.
mysql-test/t/rpl_trigger.test:
  Fix the test to query only its own tables to prevent getting tables
  from other tests.

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt

client/mysqltest.c:
  Add call to init_tmp_sh_file

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt


mysql-test/r/sp.result:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/skip_grants.result:
  Merge 5.0 and 5.0-runtime.
mysql-test/t/skip_grants.test:
  Merge 5.0 and 5.0-runtime.

client/mysqltest.c:
  Improve error messages for "inc" and "dec"
mysql-test/r/mysqltest.result:
  Update test result

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

mysql-test/mysql-test-run.sh:
  tests depend on umask

client/mysqltest.c:
  Fix typo, add extra "s"

mysql-test/lib/mtr_misc.pl:
  Revert change to outpout exe path and name in win format

Reduce code


client/mysqltest.c:
  Remove the "cmd" variable in do_sleep, left unintentionaly after merge
  Implement the same elegeant solution to fund the command name in do_modify_ar

BitKeeper/etc/ignore:
  Added include/openssl to the ignore list

 - Use tmp sh file both in system and popen 


client/mysqltest.c:
  Introduce common functions to handle unix emulation on windows using a temporary sh file.
  Use it both in my_popen and my_system.
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Fix "windows paths" in three places that doesn't automatically get fixed
  Uset the output file mysqltest.sql instead of con.sql as con is not an allowed filename on Windows
  Use system for util functions

Use system inestad of exec


mysql-test/t/trigger-grant.test:
  Use "system" instead of exec for system admin tasks
  No need to use "egrep", changing to "grep"

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

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr


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

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr


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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  mysql.com:/usr/home/bar/mysql-5.0


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

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

into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377

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

into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  SCCS merged

into  mysql.com:/usr/home/bar/mysql-4.1.b15949

mysql-test/t/grant.test:
  Auto merged
mysql-test/r/grant.result:
  manual merge
sql/sql_acl.cc:
  manual merge

  Check if the host of table hash record exactly matches host from GRANT command


mysql-test/r/grant.result:
  Fix for bug#14385 GRANT and mapping to correct user account problems
    test case
mysql-test/t/grant.test:
  Fix for bug#14385 GRANT and mapping to correct user account problems
    test case

into  mysql.com:/home/timka/mysql/src/5.0-bug-15229


mysql-test/r/join.result:
  Auto merged
mysql-test/t/join.test:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/sql_base.cc:
  SCCS merged

  calculate Item_func_format::max_length using charset->mbmaxlen


mysql-test/r/func_math.result:
  Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8
    test case
mysql-test/t/func_math.test:
  Fix for bug#16678 FORMAT gives wrong result if client run with default-character-set=utf8
    test case

into  mysql.com:/opt/local/work/mysql-5.0-root

into  mysql.com:/opt/local/work/mysql-5.0-root


libmysql/libmysql.c:
  Manual merge: use local.
tests/mysql_client_test.c:
  Manual merge: use local.

into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/t/heap.test:
  Auto merged
mysql-test/r/heap.result:
  SCCS merged