into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

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

sql/log.cc:
  check whether log tables were initialized, before trying to
  flush them during sighup processing. Then use logger THD
  for flush.

mysql-test/extra/rpl_tests/rpl_log.test:
  Sleep to avoid race condition on pushbuild test machine

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new

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

Without a flush this test is nondeterministic for "row" binlog-format.


mysql-test/r/innodb.result:
  Without a flush this test is nondeterministic for "row" binlog-format.
mysql-test/t/innodb.test:
  Without a flush this test is nondeterministic for "row" binlog-format.

into  zim.(none):/home/brian/mysql/dep-5.1

into  mysql.com:/space/pekka/ndb/version/my51

include/m_string.h:
  UNIXWare removal
include/my_global.h:
  UNIXWare removal.
include/my_no_pthread.h:
  UNIXWare removal
include/my_pthread.h:
  UNIXWare removal
mysys/my_init.c:
  UNIXWare removal
mysys/my_pthread.c:
  UNIXWare removal

Fixed forgotten merge fix


mysql-test/r/partition.result:
  Fixed forgotten merge fix

storage/ndb/src/ndbapi/NdbBlob.cpp:
  set part id from main table op (may not be complete fix)
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  log partition id set/get

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


sql/mysqld.cc:
  Auto merged

  Fix the way that instance manager finds the version number of instances,
  so that it works properly when the executable name isn't the same as what
  the instance-manager launched, such as when wrapping a libtool-wrapped
  executable from the source tree.

  This removes the 'Ver ' reported in the version column output by
  'SHOW INSTANCE STATUS ...', but the format of this column is not
  documented (and is pretty free-form to begin with).


server-tools/instance-manager/instance_options.cc:
  Look for 'Ver' to get version from running mysqld --version
server-tools/instance-manager/parse_output.cc:
  Make parse_output_and_get_value() look at the whole line to find
  the word, instead of just at the beginning of each line.
sql/mysqld.cc:
  Note that the instance manager relies on 'Ver' in mysqld --version

Found one piece I missed when I removed HAVE_mit (just broke on windows and I don't have windows locally). This I believe should fix it.


include/my_global.h:
  Fix from removing HAVE_MIT

mysql-test/r/archive.result:
  Adding test case for data directory support in create table.
mysql-test/t/archive.test:
  Added test for "data directory" support in archive.
sql/ha_archive.cc:
  Updated comments, added printable bits for support of "data directory"
sql/ha_archive.h:
  Added real_path to share (will come in handy in later code)

sql/sql_plugin.cc:
  Adding back in support for loadable engines.

into  zim.(none):/home/brian/mysql/dep-5.1

include/m_string.h:
  add missing bracket

This completes the work done in 5.0 to remove mit_pthread support (most was pulled in 5.0, but there were some pieces left in the tree)


include/my_global.h:
  mit_thread removal
include/my_pthread.h:
  mit_thread removal
mysys/my_file.c:
  mit_thread removal
mysys/my_pthread.c:
  Removal of mit_thread
mysys/my_thr_init.c:
  Removal of mit_thread

client/client_priv.h:
  OS2 removal
client/mysql.cc:
  OS2 removal
dbug/dbug.c:
  OS2 removal
include/m_string.h:
  OS2 removal
include/my_global.h:
  Cleanup for have_mit
libmysql/dll.c:
  OS2 removal
libmysql/get_password.c:
  OS2 removal
libmysql/libmysql.c:
  OS2 removal
libmysql/manager.c:
  OS2 removal
sql-common/client.c:
  OS2 removal
sql/event_executor.cc:
  OS2 removal
sql/hostname.cc:
  OS2 removal
sql/log.cc:
  OS2 removal
sql/log_event.h:
  OS2 removal
sql/my_lock.c:
  OS2 removal
sql/mysql_priv.h:
  OS2 removal
sql/mysqld.cc:
  OS2 removal
sql/net_serv.cc:
  OS2 removal
sql/repl_failsafe.cc:
  OS2 removal
sql/slave.cc:
  OS2 removal
sql/sql_base.cc:
  OS2 removal
sql/sql_insert.cc:
  OS2 removal
sql/sql_load.cc:
  OS2 removal
sql/sql_parse.cc:
  OS2 removal
sql/sql_table.cc:
  OS2 removal
storage/myisam/myisamchk.c:
  OS2 removal
storage/ndb/src/mgmclient/main.cpp:
  OS2 removal
storage/ndb/src/mgmsrv/main.cpp:
  OS2 removal
vio/vio.c:
  OS2 removal
vio/viosocket.c:
  OS2 removal
vio/viossl.c:
  OS2 removal

into  zim.(none):/home/brian/mysql/dep-5.1


mysys/my_lib.c:
  Auto merged

include/config-win.h:
  Removing OS2 stuff
include/errmsg.h:
  Removing OS2 stuff
include/m_string.h:
  OS2 removal
include/my_global.h:
  OS2 removal
include/my_net.h:
  OS2 removal
include/my_no_pthread.h:
  OS2 removal
include/my_pthread.h:
  OS2 removal
include/thr_alarm.h:
  OS2 removal
mysys/default.c:
  OS2 removal
mysys/mf_path.c:
  OS2 removal
mysys/mf_tempdir.c:
  OS2 removal
mysys/mf_tempfile.c:
  OS2 removal
mysys/my_access.c:
  OS2 removal
mysys/my_clock.c:
  OS2 removal
mysys/my_copy.c:
  OS2 removal
mysys/my_create.c:
  OS2 removal
mysys/my_dup.c:
  OS2 removal
mysys/my_file.c:
  OS2 removal
mysys/my_getwd.c:
  OS2 removal
mysys/my_init.c:
  OS2 removal
mysys/my_lib.c:
  OS2 removal
mysys/my_lock.c:
  OS2 removal
mysys/my_mkdir.c:
  OS2 removal
mysys/my_open.c:
  OS2 removal
mysys/my_pthread.c:
  OS2 removal
mysys/my_redel.c:
  OS2 removal
mysys/my_sleep.c:
  OS2 removal
mysys/my_static.c:
  OS2 removal
mysys/my_thr_init.c:
  OS2 removal
mysys/thr_alarm.c:
  OS2 removal
storage/myisam/myisamchk.c:
  OS2 removal

into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752

into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752

into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752


mysql-test/t/partition.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
sql/share/errmsg.txt:
  manual merge

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

  Include "." in header search, to find #include <lex_hash.h>


VC++Files/sql/mysqld.vcproj:
  Include "." in header search, to find #include <lex_hash.h>
VC++Files/libmysqld/libmysqld.vcproj:
  Include "." in header search, to find #include <lex_hash.h>

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


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

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

(With hand-merged tests.)


sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged

into  mysql.com:/Users/emurphy/src/mysql/bk-clean/mysql-5.1-new

unittest/mytap/tap.h:
  Handle __attribute__ more portably, fixing builds for HP-UX and AIX.

  Move -lmystrings after -ldbug, to define strmov() on HP-UX


unittest/mysys/Makefile.am:
  Move -lmystrings after -ldbug, to define strmov() on HP-UX

  Moved declarations to beginning of block


unittest/mysys/base64.t.c:
  Moved declarations to beginning of block

unittest/Makefile.am:
  add unit.pl to the list of extra files, so that
  "make dist" picks it up.

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

BitKeeper/deleted/.del-README.debian~223f0edd363d08af:
  Delete: support-files/debian/README.debian
BitKeeper/deleted/.del-changelog~8457b43736642c:
  Delete: support-files/debian/changelog
BitKeeper/deleted/.del-control~a2146883b4ed7c94:
  Delete: support-files/debian/control
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
  Delete: support-files/debian/copyright
BitKeeper/deleted/.del-gomi~bcec57fe6195deee:
  Delete: support-files/debian/gomi
BitKeeper/deleted/.del-libmysqlclient10.dirs~24c90ade3a371b6f:
  Delete: support-files/debian/libmysqlclient10.dirs
BitKeeper/deleted/.del-libmysqlclient10.postinst~5829f4e4a7c0206b:
  Delete: support-files/debian/libmysqlclient10.postinst
BitKeeper/deleted/.del-libmysqlclient9.dirs~4420713260a0eb40:
  Delete: support-files/debian/libmysqlclient9.dirs
BitKeeper/deleted/.del-libmysqlclient9.postinst~80ad5f1e4633a219:
  Delete: support-files/debian/libmysqlclient9.postinst
BitKeeper/deleted/.del-move~6b750ba06050bc92:
  Delete: support-files/debian/move
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
  Delete: support-files/debian/my.cnf
BitKeeper/deleted/.del-mysql-bench.dirs~3407d505223bf583:
  Delete: support-files/debian/mysql-bench.dirs
BitKeeper/deleted/.del-mysql-client.dirs~3f347d1649db13e1:
  Delete: support-files/debian/mysql-client.dirs
BitKeeper/deleted/.del-mysql-dev.dirs~c6cacea9b3289f33:
  Delete: support-files/debian/mysql-dev.dirs
BitKeeper/deleted/.del-mysql-doc.dirs~a468f79189ff27ad:
  Delete: support-files/debian/mysql-doc.dirs
BitKeeper/deleted/.del-mysql-max-debug.dirs~58d766ce6caffa2b:
  Delete: support-files/debian/mysql-max-debug.dirs
BitKeeper/deleted/.del-mysql-max-debug.postinst~36f2faba601ed8a:
  Delete: support-files/debian/mysql-max-debug.postinst
BitKeeper/deleted/.del-mysql-max-debug.postrm~26bdf891820d3671:
  Delete: support-files/debian/mysql-max-debug.postrm
BitKeeper/deleted/.del-mysql-max-shared.dirs~38f36e6773ac0e79:
  Delete: support-files/debian/mysql-max-shared.dirs
BitKeeper/deleted/.del-mysql-max-shared.postinst~3406aa3bae283fe0:
  Delete: support-files/debian/mysql-max-shared.postinst
BitKeeper/deleted/.del-mysql-max-shared.postrm~92193bedc2b75355:
  Delete: support-files/debian/mysql-max-shared.postrm
BitKeeper/deleted/.del-mysql-max.dirs~be29c2b464db6050:
  Delete: support-files/debian/mysql-max.dirs
BitKeeper/deleted/.del-mysql-max.postinst~cc8a0b3de02b23e0:
  Delete: support-files/debian/mysql-max.postinst
BitKeeper/deleted/.del-mysql-max.postrm~66c355bd3081578b:
  Delete: support-files/debian/mysql-max.postrm
BitKeeper/deleted/.del-mysql-server-debug.dirs~7b6329c9df635ce4:
  Delete: support-files/debian/mysql-server-debug.dirs
BitKeeper/deleted/.del-mysql-server-debug.postinst~12af8ffb8a145fae:
  Delete: support-files/debian/mysql-server-debug.postinst
BitKeeper/deleted/.del-mysql-server-debug.postrm~ae113145ebc34ac8:
  Delete: support-files/debian/mysql-server-debug.postrm
BitKeeper/deleted/.del-mysql-server-shared.dirs~cb56821f47811c7c:
  Delete: support-files/debian/mysql-server-shared.dirs
BitKeeper/deleted/.del-mysql-server-shared.postinst~c6fee24788b634a7:
  Delete: support-files/debian/mysql-server-shared.postinst
BitKeeper/deleted/.del-mysql-server-shared.postrm~f3d7f9c6bfb3ca9b:
  Delete: support-files/debian/mysql-server-shared.postrm
BitKeeper/deleted/.del-mysql-server.conffiles~566a6664d16909f0:
  Delete: support-files/debian/mysql-server.conffiles
BitKeeper/deleted/.del-mysql-server.dirs~b12380a091807c5e:
  Delete: support-files/debian/mysql-server.dirs
BitKeeper/deleted/.del-mysql-server.postinst~d72bf57a84001364:
  Delete: support-files/debian/mysql-server.postinst
BitKeeper/deleted/.del-mysql-server.postrm~68a988229b41c3bb:
  Delete: support-files/debian/mysql-server.postrm
BitKeeper/deleted/.del-mysql-server.prerm~4445eacc70e74899:
  Delete: support-files/debian/mysql-server.prerm
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
  Delete: support-files/debian/rules
BitKeeper/deleted/.del-shlibs~3fe34471c220623c:
  Delete: support-files/debian/shlibs
BitKeeper/deleted/.del-aa~f8c7e976fa99167f:
  Delete: support-files/debian/patches/aa
BitKeeper/deleted/.del-ab~1145a71fc2a5dbb8:
  Delete: support-files/debian/patches/ab
BitKeeper/deleted/.del-ac~66b41066a435209:
  Delete: support-files/debian/patches/ac
BitKeeper/deleted/.del-ad~9296238d4d7d5bb3:
  Delete: support-files/debian/patches/ad
BitKeeper/deleted/.del-ae~c54b032746985759:
  Delete: support-files/debian/patches/ae
BitKeeper/deleted/.del-az~45092291b7eff90a:
  Delete: support-files/debian/patches/az
BitKeeper/deleted/.del-ta~ec794c5d9d922b6c:
  Delete: support-files/debian/patches/ta
BitKeeper/deleted/.del-tb~8844e8c985e40d4e:
  Delete: support-files/debian/patches/tb