into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/mtr_cases.pm:
  Auto merged

not have a my.cnf of it's own
- Fix paths: master-data => mysqld.1/data, ../std_data_ln => MYSQLTEST_VARDIR/std_data


mysql-test/lib/mtr_cases.pm:
  Add autodetection of which my.cnfs to use for each testcase if suite does
  not have a my.cnf of it's own
mysql-test/suite/parts/inc/partition.pre:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_basic.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_check_drop.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_layout.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_layout_check1.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_layout_check2.inc:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
  Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data
mysql-test/suite/parts/r/part_supported_sql_func_innodb.result:
  Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data
mysql-test/suite/parts/r/part_supported_sql_func_myisam.result:
  Update paths, ../std_dataln_ => MYSQLTEST_VARDIR/std_data
mysql-test/suite/parts/r/partition_alter1_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter2_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter3_innodb.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter3_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_alter4_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_engine_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_syntax_myisam.result:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/r/partition_t55.out:
  Update paths, master-data => mysqld.1/data
mysql-test/suite/parts/t/partition_sessions.test:
  Update paths, master-data => mysqld.1/data

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


mysql-test/lib/My/SafeProcess.pm:
  Auto merged

 - Fix 'my_win_init' code that handles initialization of
   "query_performance_counter" and conversion from registry values to
   environment strings


mysys/my_init.c:
  - Change check of return value from 'QueryPerformanceFrequency', it
    returns 0 on error
  - Don't return from 'my_win_init' if the registry 
    key "HKEY_LOCAL_MACHINE\SOFTWARE\MySQL" doesn't exist. This caused
    the initialization of "query_performance_counter" to be bypassed unless there
    was at lest such a key.
  - Cleanup the "registry -> environment variables" from Italian comments,
    remove redundant variables and fix style.
  - Remove function 'setEnvString' and replace it with oneliner 'strxmov'

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr

Disable dynamic option switch

 - Open tables readonly while not properly initialized
 - Close cached tables when coming out of readonly mode
 - Apply basically same patch as for 32275


mysql-test/include/ndb_not_readonly.inc:
  Fix syntax of "die" call
  Remove the maskin of ER_GET_ERRMSG, should never happen
sql/ha_ndbcluster.cc:
  - Open tables readonly until binlog tables have been 
    initialized
sql/ha_ndbcluster_binlog.cc:
  - Reset "ndb_binlog_tables_inited" when something has happened to schema table,
  apply status table or when connection to cluster is lost. 
  - Close cached tabled after setting ndb_binlog_is_ready to cleanout any
  tables opened as readonly.

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


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

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr

mysql-test/lib/My/Options.pm:
  Add conversion from --set-variable=name=value to SET GLOBAL name=value

return code from "could not find command" which is 1, conflicts with return
code from diff failed, which is also 1.

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


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

with another MTR_BUILD_THREAD=auto run

mysql-test/mysql-test-run.pl:
  Try to dynamically change option, restart if it fails.
mysql-test/lib/mtr_cases.pm:
  Try to dynamically change option, restart if it fails.
mysql-test/lib/mtr_misc.pl:
  Move functions to My::Optiosn
mysql-test/lib/mtr_report.pl:
  Add a small dot if test detected restart
mysql-test/lib/My/Options.pm:
  New BitKeeper file ``mysql-test/lib/My/Options.pm''
mysql-test/lib/t/Options.t:
  New BitKeeper file ``mysql-test/lib/t/Options.t''

mysql-test/include/wait_show_pattern.inc:
  Guard against ' in $result

mysql-test/include/default_mysqld.cnf:
  Turn on log-bin by default for all mysqlds
mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result:
  Update name of binlog file
mysql-test/suite/ndb/r/ndb_binlog_discover.result:
  Update name of binlog file
mysql-test/suite/ndb/r/ndb_binlog_format.result:
  Update name of binlog file
mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result:
  Update name of binlog file
mysql-test/suite/ndb/r/ndb_binlog_log_bin.result:
  Update name of binlog file
mysql-test/suite/ndb/r/ndb_binlog_multi.result:
  Update name of binlog file
mysql-test/suite/ndb/t/ndb_binlog_discover.test:
  Update name of binlog file

mysql-test/t/mysqlbinlog_base64.test:
  Update path to master-bin file
  Remove non portable "exec rm"