sql/handler.h:
  Adding Falcon

sql/CMakeLists.txt:
  Compile problem for Windoows
storage/innobase/handler/ha_innodb.cc:
  Removed some dead code (Marko approved)

Adding in a few more engines to the now defunct (but still used) handler enum's since its the only way to enable for partitioning. 


sql/handler.h:
  Extended to add in more DB types for partioning.

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

storage/innobase/handler/ha_innodb.h:
  Rename: sql/ha_innodb.h -> storage/innobase/handler/ha_innodb.h
libmysqld/Makefile.am:
  Removed Innodb specific mention
sql/Makefile.am:
  Updated to remove innodb
storage/innobase/CMakeLists.txt:
  Added include directory
storage/innobase/Makefile.am:
  Updated to add in handler
storage/innobase/handler/ha_innodb.cc:
  Adjusted include files, also disabled replication code which was not being used.
storage/innobase/plug.in:
  Added additional Makefile
storage/innobase/handler/Makefile.am:
  New BitKeeper file ``storage/innobase/handler/Makefile.am''

  Update of Dutch errmsg translations (not complete yet)
errmsg.h:
  Fixup of changed error message file path in comment
authors.h:
  Ego add.


include/errmsg.h:
  Fixup of changed error message file path in comment
sql/authors.h:
  Ego add.
sql/share/errmsg.txt:
  Update of Dutch errmsg translations (not complete yet)

into  zim.(none):/tmp/merge-5.1


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

state_mask argument to plugin_foreach()


sql/sql_show.cc:
  state_mask argument to plugin_foreach()

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/sql_class.h:
  Auto merged

    merge to 5.1 - yet another merge fix


sql/log.cc:
  yet another merge fix

  merge to 5.1


sql/log.h:
  merge to 5.1

into  perch.ndb.mysql.com:/home/jonas/src/51-work


sql/log.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_class.h:
  merge

into  perch.ndb.mysql.com:/home/jonas/src/50-work


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  merge

  fix deadlock if master switches log file in parallell with "show master logs"
  


sql/log.cc:
  add raw_get_current_log which dont take log mutex
sql/sql_class.h:
  add raw_get_current_log which dont take log mutex
sql/sql_repl.cc:
  Fix lock order i.e first log_lock then index_lock

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  fix ndb-violations of strict aliasing found by gcc4.1
  (crashes in ndb_dd_*)


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix strict-aliasing
storage/ndb/src/kernel/vm/KeyTable2Ref.hpp:
  Fix strict-aliasing
storage/ndb/src/kernel/vm/Pool.hpp:
  Fix strict-aliasing

  gcc-4.1.1 work-around for bug in strict-aliasing


storage/ndb/src/kernel/blocks/restore.cpp:
  gcc-4.1.1 work-around for bug in strict-aliasing

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


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

into  zim.(none):/tmp/mysql-5.1-arch


sql/ha_innodb.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Merge

storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile
storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp
storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile
storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp
mysql-test/include/have_ndbapi_examples.inc:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/include/have_ndbapi_examples.inc
mysql-test/t/ndbapi.test:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/t/ndbapi.test
mysql-test/t/rpl_ndbapi_multi.test:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/t/rpl_ndbapi_multi.test
mysql-test/r/have_ndbapi_examples.require:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/r/have_ndbapi_examples.require
mysql-test/r/ndbapi.result:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/r/ndbapi.result
mysql-test/r/rpl_ndbapi_multi.result:
  BitKeeper file /windows/Linux_space/MySQL/mysql-5.1/mysql-test/r/rpl_ndbapi_multi.result

into  moonbone.local:/work/tmp_merge-5.1-mysql


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

mysql-test/t/disabled.def:
  Removed disabled test since it only affects Windows
mysql-test/t/partition.test:
  Removed Windows from test since bug#19107 is known to hang test
mysql-test/t/partition_mgm_err2.test:
  Removed Windows from test since bug#19107 is known to hang test

into  zim.(none):/tmp/mysql-5.1-arch


sql/ha_ndbcluster.cc:
  Auto merged

into  dator5.(none):/home/pappa/push_clone


sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/t/disabled.def:
  manual merge

into  zim.(none):/tmp/mysql-5.1-arch


sql/mysqld.cc:
  Auto merged

into  dator5.(none):/home/pappa/push_clone


sql/share/errmsg.txt:
  Auto merged

The problem was in dummy grep on AIX and HPUX.

The fix is to use more portable patterns.

The patch is only for test suite
(i.e. does not touch server codebase).


mysql-test/r/im_instance_conf.result:
  Updated result file.
mysql-test/t/disabled.def:
  Fix typo.
mysql-test/t/im_instance_conf.imtest:
  Make grep-pattern aix/hpux-compatible.
mysql-test/t/im_options.imtest:
  Make grep-pattern aix/hpux-compatible.
mysql-test/t/im_options-im.opt:
  Speedup IM-tests.

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/share/errmsg.txt:
  Auto merged

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1

into  dator5.(none):/home/pappa/push_clone


mysql-test/r/partition.result:
  Auto merged
sql/share/errmsg.txt:
  Auto merged