into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug


mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged

server-tools/instance-manager/parse.cc:
  shift the second value for the log

into  zim.tangent.org:/home/brian/mysql/dep-5.1


sql/sql_plugin.cc:
  SCCS merged

sql/sql_plugin.cc:
  Removed support for Storage gneines.

into  mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message

mysql-test/r/ndb_bitfield.result:
  Update result
mysql-test/r/ndb_dd_basic.result:
  Update result
mysql-test/r/ndb_dd_disk2memory.result:
  Update result
mysql-test/r/ndb_partition_key.result:
  Update result
mysql-test/r/ndb_partition_range.result:
  Update result
mysql-test/r/ndb_temporary.result:
  Update result
mysql-test/r/rpl_ndb_UUID.result:
  Update result

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/t/disabled.def:
  Auto merged

corrected by Ingo when pushing WL#1563

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/create.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/rpl_mixed_ddl_dml.result:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/bdb.result:
  Resolve conflict
mysql-test/t/bdb.test:
  Resolve conflict
sql/share/errmsg.txt:
  Resolve conflict

into  mysql.com:/home/jimw/my/mysql-5.1-clean


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/func_str.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
mysql-test/t/disabled.def:
  Resolve conflict

into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/sql_table.cc:
  Auto merged

BitKeeper/etc/ignore:
  Added scripts/mysql_upgrade to the ignore list
mysql-test/r/subselect.result:
  Update results

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_strfunc.cc:
  Auto merged

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

  - do not try to create ndb temp tables even if default storage is ndb


mysql-test/r/ndb_temporary.result:
  New BitKeeper file ``mysql-test/r/ndb_temporary.result''
mysql-test/t/ndb_temporary.test:
  New BitKeeper file ``mysql-test/t/ndb_temporary.test''

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

 - Remove global  MYSQL connection variable


client/mysqlimport.c:
  Remove the global "MYSQL mysql_connection" variable. Use one MYSQL for each thread.
  Set exitcode if any of the threads fails, better than nothing.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqlcheck.c:
  Auto merged

  Tweak --check-upgrade help text.


client/mysqlcheck.c:
  Tweak --check-upgrade help text.

  Updated version number to 5.1.8


configure.in:
  Updated version number to 5.1.8

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1

into  mysql.com:/usr/home/bar/mysql-5.1-new.16234

into moonbone.local:/work/15706-bug-5.0-mysql

into  mysql.com:/usr/home/bar/mysql-5.1-new.16234

5.1-related fixes


BitKeeper/etc/ignore:
  Added scripts/mysql_upgrade to the ignore list
sql/ha_partition.cc:
  ha_check and ha_repair now to be called
sql/handler.cc:
  code modified to be 5.1 compliant

  new file:
  Adding a test case for "Migration tool for 5.1 table name encoding"

  Sorry, forgot to push in the previous changeset.


client/client_priv.h:
  Sorry, forgot to push in the previous changeset.

  WL#3046  Migration tool for 5.1 table-name encoding


client/mysqlcheck.c:
  WL#3046  Migration tool for 5.1 table-name encoding

disabled non deterministic test

include/myisam.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
include/my_base.h:
  merging
scripts/Makefile.am:
  merging
sql/handler.cc:
  merging
sql/share/errmsg.txt:
  merging
sql/sql_yacc.yy:
  merging

into mysql.com:/home/hf/work/mysql-5.1.w2645


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged

into mysql.com:/home/hf/work/mysql-5.0.w2645


sql/sql_table.cc:
  Auto merged

necessary implementation in the server
mysql_upgrade script added


client/mysqlcheck.c:
  --check-upgrade option added
include/my_base.h:
  errcode added
include/myisam.h:
  option added
scripts/Makefile.am:
  mysql_upgrade script added
sql/handler.cc:
  checks for old types/bugs added
sql/handler.h:
  declarations regarding checks for upgrade
sql/lex.h:
  sym added
sql/share/errmsg.txt:
  error message added
sql/slave.cc:
  now ha_repair is for public use
sql/sql_table.cc:
  upgrade in ha_repair implemented
sql/sql_yacc.yy:
  CHECK ... FOR UPGRADE added to syntax

mysql-test/r/rpl_stm_log.result:
  Fixing test case