into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


configure.in:
  Manual merge.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


mysys/my_thr_init.c:
  Auto merged

into  maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-maint


BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint


BitKeeper/deleted/.del-configure.in.rej:
  Auto merged
configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged

  Fix test case: add drop table


mysql-test/t/innodb_mysql.test:
  Fix test case: add drop table
mysql-test/r/innodb_mysql.result:
  Fix test case: add drop table

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


mysys/my_thr_init.c:
  Auto merged

	errno

Vasil Dimov (at Oracle) noted that pthread_key_create() does not
set errno, so if it fails then we return the wrong error code.

Instead, capture the return value, which is the real error value, 
and instead report that.


mysys/my_thr_init.c:
  pthread functions don't set the global errno, which should be
  obvious.

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


client/mysql.cc:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge

  Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE


mysql-test/r/innodb_mysql.result:
  Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE
mysql-test/t/innodb_mysql.test:
  Add test case for Bug #27210: INNODB ON DUPLICATE KEY UPDATE

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysql_upgrade.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged
mysql-test/r/mysql_upgrade.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged

client/mysql_upgrade.c:
  Add defines for WEXITSTATUS
  Pass arguments on command line instead of --defaults-file=<temp file>
mysql-test/r/mysql_upgrade.result:
  When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
  is used on all platforms.
mysql-test/t/mysql_upgrade.test:
  When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
  is used on all platforms.
scripts/comp_sql.c:
  Some compilers have a max string length, insert a newline at
  every 512th char in long strings

mysql-test/r/innodb.result:
  Move test result after incorrect merge

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged

client/mysql_upgrade.c:
  Windows fix
scripts/CMakeLists.txt:
  Fix problems with CMakeList causing build to fail
scripts/comp_sql.c:
  Improve comp_sql.c to generate output file with shorter strings

into  mysql.com:/home/ram/work/b26851/b26851.5.0

into  mysql.com:/home/ram/work/b26851/b26851.5.1

Bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb, Bug #25296  Truncate table converts NDB disk based tables to in-memory tables: Added more checks in tests

into  mysql.com:/home/ram/work/b22824/my50-b22824


sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/strict.result:
  merging
mysql-test/t/strict.test:
  merging

into  mysql.com:/home/ram/work/b26851/b26851.5.0


client/mysql.cc:
  Auto merged

into  mysql.com:/home/ram/work/b26851/b26851.5.1


client/mysql.cc:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged

into  mysql.com:/home/ram/work/b22824/my51-b22824


mysql-test/r/strict.result:
  merging
mysql-test/t/strict.test:
  merging
sql/item_cmpfunc.cc:
  merging

client/mysqltest.c:
  Actually include "client_priv.h", as intended in previous changeset.

include client_priv.h in mysqltest.c.  Portability fix.


client/client_priv.h:
  Include client_priv.h, for WEXITSTATUS definition.
  
  Remove code which is already in client_priv.h.
  
  Rearrange OPT_* enum to co-exist with options defined in client_priv.h.
client/mysqltest.c:
  Move WEXITSTATUS #define from mysqltest.c to client_priv.h, as it is
  useful in other clients (in particular, current mysql_upgrade.c won't
  compile without it on some platforms).
  
  Add a final OPT_MAX_CLIENT_OPTION to enum options_client, which can
  be used when a maximum shared client option value is needed.

into  siva.hindu.god:/home/tsmith/m/inno/apr18/51

into  siva.hindu.god:/home/tsmith/m/inno/apr18/51

into  siva.hindu.god:/home/tsmith/m/inno/apr18/50