mysql-test/r/xml.result:
  - Adding test case
  - Fixing error message
mysql-test/t/xml.test:
  Adding test case
sql/item_xmlfunc.cc:
  For grammar rules with loops like:
  
    AdditiveExpr ::= MultiplicativeExpr ('+' MultiplicativeExpr)*
  
  If we scanned scanned '+' and then met an error when parsing
  MultiplicativeExpr, then we should fully stop parsing - without
  trying to apply any other rules.
  
  Fix: add "error" member into MY_XPATH structure,
  and make my_xpath_parse_term() never return success
  as soon as error set.
strings/xml.c:
  Adding my_xml_ctype map for flags, indicating
  whether a character is a space character, is a
  valid identifier start character, is a valid
  identifier body character. Using this map to
  properly scan identifiers. Also, using this map
  to scan spaces faster (instead of strchr).

  Fixing failed merge


sql/log.cc:
  Fixing failed merge

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

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

storage/archive/azio.c:
  Fixed warnings for windows
storage/federated/ha_federated.cc:
  Warning fixes for Windows
storage/innobase/CMakeLists.txt:
  Fixed includes for Windows

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''

fixed multiple and missing deinitializations, moved all
deinit/del code in one place

remove #define __attribute__(A) from plugin.h
increase API version because placeholders were added
more robust definition of min_plugin_interface_version


include/mysql/plugin.h:
  move #define __attribute__(A) out of plugin.h (not part of the API)
  increase API version because placeholders were added
plugin/fulltext/plugin_example.c:
  compilation failure on non-GCC compilers
sql/sql_plugin.cc:
  more robust definition of min_plugin_interface_version
  it should work even when we forget to update it

  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  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


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

into  production.mysql.com:/usersnfs/rburnett/mysql-5.1


libmysqld/libmysqld.def:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.cc:
  Auto merged

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