mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged

  - Back porting of some changes in later releases
  - Corrected valgrind support
  - Removed work around for TZ needed in VisualStudio 6
  - Don't restart master to add special settings from "<testcase>-master.opt",
    if same settngs as running master, feature request in bug#12433
  - With --reorder, keep tests with same *-master.opt content together,
    to save even more master restarts


mysql-test/lib/mtr_misc.pl:
  Added functions to compare lists of options
mysql-test/lib/mtr_cases.pl:
  Removed special code for Windows as in VC6 we unset
  TZ to avoid library bug
mysql-test/mysql-test-run.pl:
  Handle pseudo option --timezone=<spec> that sets TZ

into  shellback.(none):/home/msvensson/mysql/mysqltestrun_ndbclusterstart/my50-mysqltestrun_ndbclusterstart

 - Fix problems that occur when ndbcluster is not supported


mysql-test/lib/mtr_cases.pl:
  Marked test to be skipped if it is a ndb test but ndb is not supported
mysql-test/mysql-test-run.pl:
  Check "opt_with_ndbcluster" before deciding to stop masters and when dciding if cluster needs to be started.

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

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

into  neptunus.(none):/home/msvensson/mysql/bug17137/my41-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''

into  shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574

  Allow space in base directory path, bug#15736


mysql-test/mysql-test-run.pl:
  Allow space in base directory path, bug#15736

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  shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574


mysql-test/mysql-test-run.pl:
  Auto merged

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

mysql-test/lib/mtr_cases.pl:
  Always set "ndb_test" if tets name contains ndb. 
  Set to skipped if "--skip-ndbcluster"
mysql-test/lib/mtr_report.pl:
  Print special error message for ndb_test that are failed due to failure to start or install ndbcluster
mysql-test/mysql-test-run.pl:
  Remove mtr_error call from ndbcluster_install, instead check after ndbcluster_install if test run should continue or if it should be aborted
  Faile ndb test and print special error message if it's a ndb test and flag_ndb_status_ok is not ok

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