into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


client/mysqldump.c:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged

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

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


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

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


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

Fix name of function in warning message.


sql/item_timefunc.cc:
  Fix error message in extract_date_time(); ("str_to_time" -> "str_to_date")

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

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

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

mysql-test/t/query_cache.test:
  Disable query_cache test on embedded, due to bug 30710.
sql/log_event_old.cc:
  Post-merge fix, change RELAY_LOG_INFO to Relay_log_info.

mysql-test/include/rpl_udf.inc:
  ORDER BY to force order
mysql-test/suite/rpl/r/rpl_udf.result:
  Fix for ORDER BY

into  sita.local:/Users/tsmith/m/bk/maint/51


sql/field.cc:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/rpl_record.h:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/slave.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
sql/log_event.cc:
  Manual merge
sql/log_event.h:
  Manual merge
sql/log_event_old.h:
  Manual merge
sql/rpl_record.cc:
  Manual merge
sql/slave.cc:
  Manual merge

  Do not convert innodb autoincrement value to little endian when on
  big endian systems.


storage/innobase/row/row0sel.c:
  Do not convert innodb autoincrement value to little endian when on
  big endian systems.

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

mysql-test/suite/im/t/im_daemon_life_cycle-im.opt:
  Rename: mysql-test/t/im_daemon_life_cycle-im.opt -> mysql-test/suite/im/t/im_daemon_life_cycle-im.opt
mysql-test/suite/im/t/im_instance_conf-im.opt:
  Rename: mysql-test/t/im_instance_conf-im.opt -> mysql-test/suite/im/t/im_instance_conf-im.opt
mysql-test/suite/im/t/im_life_cycle-im.opt:
  Rename: mysql-test/t/im_life_cycle-im.opt -> mysql-test/suite/im/t/im_life_cycle-im.opt
mysql-test/suite/im/t/im_options-im.opt:
  Rename: mysql-test/t/im_options-im.opt -> mysql-test/suite/im/t/im_options-im.opt
mysql-test/suite/im/t/im_utils-im.opt:
  Rename: mysql-test/t/im_utils-im.opt -> mysql-test/suite/im/t/im_utils-im.opt
mysql-test/suite/im/r/im_cmd_line.result:
  Rename: mysql-test/r/im_cmd_line.result -> mysql-test/suite/im/r/im_cmd_line.result
mysql-test/suite/im/r/im_daemon_life_cycle.result:
  Rename: mysql-test/r/im_daemon_life_cycle.result -> mysql-test/suite/im/r/im_daemon_life_cycle.result
mysql-test/suite/im/r/im_instance_conf.result:
  Rename: mysql-test/r/im_instance_conf.result -> mysql-test/suite/im/r/im_instance_conf.result
mysql-test/suite/im/r/im_life_cycle.result:
  Rename: mysql-test/r/im_life_cycle.result -> mysql-test/suite/im/r/im_life_cycle.result
mysql-test/suite/im/r/im_options.result:
  Rename: mysql-test/r/im_options.result -> mysql-test/suite/im/r/im_options.result
mysql-test/suite/im/r/im_utils.result:
  Rename: mysql-test/r/im_utils.result -> mysql-test/suite/im/r/im_utils.result
mysql-test/suite/im/t/utils.sh:
  Rename: mysql-test/t/utils.sh -> mysql-test/suite/im/t/utils.sh
mysql-test/suite/im/t/wait_for_process.sh:
  Rename: mysql-test/t/wait_for_process.sh -> mysql-test/suite/im/t/wait_for_process.sh
mysql-test/suite/im/t/wait_for_socket.sh:
  Rename: mysql-test/t/wait_for_socket.sh -> mysql-test/suite/im/t/wait_for_socket.sh
mysql-test/suite/im/t/log.sh:
  Rename: mysql-test/t/log.sh -> mysql-test/suite/im/t/log.sh
mysql-test/suite/im/t/kill_n_check.sh:
  Rename: mysql-test/t/kill_n_check.sh -> mysql-test/suite/im/t/kill_n_check.sh
mysql-test/suite/im/t/im_check_env.inc:
  Rename: mysql-test/include/im_check_env.inc -> mysql-test/suite/im/t/im_check_env.inc
mysql-test/suite/im/t/im_cmd_line.imtest:
  Update location of im_check_env.inc
mysql-test/suite/im/t/im_daemon_life_cycle.imtest:
  Update location of im_check_env.inc
  Add variable UTIL that points to the "ugly" .sh scripts
mysql-test/suite/im/t/im_instance_conf.imtest:
  Update location of im_check_env.inc
mysql-test/suite/im/t/im_life_cycle.imtest:
  Update location of im_check_env.inc
  Add variable UTIL that points to the "ugly" .sh scripts
mysql-test/suite/im/t/im_options.imtest:
  Update location of im_check_env.inc
mysql-test/suite/im/t/im_utils.imtest:
  Update location of im_check_env.inc
  Add variable UTIL that points to the "ugly" .sh scripts
mysql-test/t/disabled.def:
  Move disabled im test to suite/im/t/disabled.def
mysql-test/suite/im/t/disabled.def:
  New BitKeeper file ``mysql-test/suite/im/t/disabled.def''

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


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

'mysqld_wait_started' don't return prematurely because of an old
pidfile

into  kindahl-laptop.dnsalias.net:/home/bk/merge-5.1-target-5.1.22

Removing unguarded read of slave_running field from inside
terminate_slave_threads(). This could cause premature exit in the event
that the slave thread already were shutting down, but isn't finished yet.

The fields slave_running, io_thd, and sql_thread are guarded by an
associated run_lock. A read of these fields were not guarded inside
terminate_slave_threads(), which caused an assertion to fire. The
assertion was removed, and the code reorganized slightly.


sql/slave.cc:
  Changing signature of terminate_slave_thread() to accept a skip_lock
  parameter instead of two mutexes. This mimics the signature of the
  terminate_slave_threads() function. Code is also changed as a result
  of this.
  
  Removing unguarded check of slave_running field in the master info and
  relay log info structure since that could cause premature exit of
  terminate_slave_threads().
  
  The thread variable for each of the slave threads can change before
  acquiring the run_lock mutex inside terminate_slave_thread(). Hence
  an assertion was removed that read the variable without guarding it
  with run_lock.
  
  Code that checked *slave_running status inside terminate_slave_thread()
  was reorganized slightly.
sql/slave.h:
  Moving terminate_slave_thread() to use internal linkage.

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


mysql-test/t/myisam.test:
  Use local

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


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

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


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

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


mysql-test/t/backup.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged

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


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

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

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

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


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

mysql-test/lib/mtr_misc.pl:
  Add function 'mtr_rmtree' it will try 'rmtree' and if that fails (most likely
  due to permission problems we will fun File::find to chmod all files and dirs
  to 0777 and then delete.
mysql-test/mysql-test-run.pl:
  Use 'mtr_rmtree' in favour of 'rmtree'

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22

- reverting patch as there where unknows sideeffects that we do not have time to follow up on just now