include/my_bitmap.h:
  Added missing prototypes.

More changes according to review comments.


unittest/README.txt:
  Changes to manifest.
unittest/mysys/bitmap.t.c:
  Removed unused functions and variables. Marked unused parameters
  as unused. No need to test every size up to 4096 bits, testing to 1024,
  but I think this is too much as well.
unittest/unit.pl:
  Added test for version-specific function.

Added 'test' target to build and run tests. Added documentation.
Added README.txt files. Fixing problem with initialization of
the Test::Harness::Straps replacement. Added code to filter out non-
test directories.


unittest/Makefile.am:
  Adding 'test' target to build and run tests.
unittest/examples/skip.t.c:
  Changing text for skip reason.
unittest/examples/skip_all.t.c:
  Changing text for skip reason.
unittest/mytap/tap.c:
  Adding copyright. Adding documentation. Minor code changes.
unittest/mytap/tap.h:
  Adding copyright. Adding documentation.
unittest/unit.pl:
  Initializing replacement Test::Harness::Straps properly.
  Adding code to filter non-test directories from default directories
  to use.
unittest/README.txt:
  New BitKeeper file ``unittest/README.txt''

Moving mytap library into unittest/
Adding 'test' target to make and run unit tests.
Minor fixes.


unittest/mytap/Doxyfile:
  mvdir
unittest/mytap/t/basic.t.c:
  mvdir
unittest/mytap/tap.c:
  mvdir
unittest/mytap/tap.h:
  mvdir
Makefile.am:
  Correcting after moving mytap/
configure.in:
  Correcting after moving mytap/
unittest/Makefile.am:
  Adding 'test' target to build and execute unit tests.
unittest/examples/Makefile.am:
  Correcting after moving mytap/
unittest/mysys/Makefile.am:
  Correcting after moving mytap/
unittest/mysys/bitmap.t.c:
  Adding copyright notice.
unittest/mytap/Makefile.am:
  Correcting after moving mytap/
unittest/mytap/t/Makefile.am:
  Correcting after moving mytap/
unittest/mysys/base64.t.c:
  New BitKeeper file ``unittest/mysys/base64.t.c''

Added missing mytap/t/Makefile.am and minor fix to Makefile.am


Makefile.am:
  Missing directories 'mytap' and 'unittest' in DIST_SUBDIRS.
mytap/t/Makefile.am:
  New BitKeeper file ``mytap/t/Makefile.am''

An implementation of the TAP framework for writing unit tests.


Makefile.am:
  Adding directories mytap and unittest
configure.in:
  Building Makefiles for mytap and unittest directories.
mytap/Doxyfile:
  New BitKeeper file ``mytap/Doxyfile''
mytap/Makefile.am:
  New BitKeeper file ``mytap/Makefile.am''
mytap/t/basic.t.c:
  New BitKeeper file ``mytap/t/basic.t.c''
mytap/tap.c:
  New BitKeeper file ``mytap/tap.c''
mytap/tap.h:
  New BitKeeper file ``mytap/tap.h''
unittest/Makefile.am:
  New BitKeeper file ``unittest/Makefile.am''
unittest/examples/Makefile.am:
  New BitKeeper file ``unittest/examples/Makefile.am''
unittest/examples/no_plan.t.c:
  New BitKeeper file ``unittest/examples/no_plan.t.c''
unittest/examples/simple.t.c:
  New BitKeeper file ``unittest/examples/simple.t.c''
unittest/examples/skip.t.c:
  New BitKeeper file ``unittest/examples/skip.t.c''
unittest/examples/skip_all.t.c:
  New BitKeeper file ``unittest/examples/skip_all.t.c''
unittest/examples/todo.t.c:
  New BitKeeper file ``unittest/examples/todo.t.c''
unittest/mysys/Makefile.am:
  New BitKeeper file ``unittest/mysys/Makefile.am''
unittest/mysys/bitmap.t.c:
  New BitKeeper file ``unittest/mysys/bitmap.t.c''
unittest/unit.pl:
  New BitKeeper file ``unittest/unit.pl''

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


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

ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour

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


sql/table.cc:
  Auto merged

mysql-test/include/have_udf.inc:
  Add comment that a check for udf_example.so must be made
mysql-test/t/disabled.def:
  Disable udf.test

ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour

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

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

into  mysql.com:/usr/home/bar/mysql-5.0


sql/table.cc:
  Auto merged

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

  After review fix.
  Thanks to Gluh for suggestion.
  Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error


sql/item_xmlfunc.cc:
  After review fix.
  Thanks to Gluh for suggestion.
  Bug#18172: XML: Extractvalue() accepts mallformed XPath without a XPath syntax error

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

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


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged

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


sql/mysql_priv.h:
  Auto merged

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.1

mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Moving statement-based replication test away from common file.
mysql-test/r/ctype_cp932_binlog_stm.result:
  Result change
mysql-test/t/ctype_cp932_binlog_stm.test:
  Moving statement-based replication test away from common file.

    (approved by kostja)


libmysql/libmysql.c:
  fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163) 
  (approved by kostja)

into  mysql.com:/home/bk/b18293-mysql-5.1-new


sql/item.cc:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
mysql-test/r/binlog_stm_ctype_ucs.result:
  Merge with mysql-5.0

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

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


sql/mysqld.cc:
  Auto merged

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


configure.in:
  Auto merged

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

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

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


sql/mysqld.cc:
  Auto merged

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

 - Add protection so that 'show_ssl_get_cipher_list' does not write after end of "buff"


sql/mysqld.cc:
  Add check to not write after the end of "buff" when listing the available ciphers

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

- in ndb_binlog_thread_handle_schema_event make sure to postpone "slock achnowledgement" until event has been put into the binlog

+ some cleanup, Cluster_replication_schem -> Cluster_schema, indentation

into  mysql.com:/home/bk/b18293-mysql-5.0

Generating character set-independent quoting of strings for the
binary log when executing statements from inside stored procedure.


mysql-test/r/ctype_cp932_binlog.result:
  Result change
mysql-test/t/ctype_cp932_binlog.test:
  Adding check that string literals are written correctly for multi-byte
  character sets.
sql/item.cc:
  Cutting out character set-independent string escaping code and putting it
  in a separate function.
sql/log_event.cc:
  Adding characters set-independent code to separate function.
sql/mysql_priv.h:
  Adding new function.
sql/sp_head.cc:
  Escaping string value representing a string item.

configure.in:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/r/query_cache_notembedded.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
sql/ha_innodb.cc:
  manual merge
sql/sql_insert.cc:
  manual merge