"NDB replication fails when no explicit--binlog-format given"
  fix initialization, storage engine initialization must occur after
  logging type is configured


sql/mysqld.cc:
  Bug#19536
    fix initialization, storage engine initialization must occur after
    logging type is configured

into  zim.(none):/home/mikael/bug19313

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

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


sql/sql_base.cc:
  Auto merged

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

storage/archive/cmakelists.txt:
  fix include path
storage/blackhole/cmakelists.txt:
  fix include path
storage/csv/cmakelists.txt:
  fix include path

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


client/mysql.cc:
  Resolve conflict

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

into  xiphis.org:/home/antony/work2/wl3201-final


sql/ha_innodb.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  mysql.com:/home/alexi/innodb/mysql-5.1

into  mysql.com:/home/alexi/innodb/mysql-5.1


storage/innobase/include/dict0dict.ic:
  SCCS merged

 Fixed BUG#19366: "consistent_snapshot.test fails".


innobase/include/dict0dict.ic:
  Applied innodb-5.0-ss521 snapshot.
   Remove too strict assertions from some dict_table_t
   accessor functions (bug #19366).

into  mysql.com:/home/alexi/innodb/mysql-5.1
 Null-merge.


storage/innobase/include/dict0dict.ic:
  Null-merge.

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
 Null-merge.


innobase/include/dict0dict.ic:
  Null-merge.

 Fixed BUG#19366: "consistent_snapshot.test fails".


innobase/include/dict0dict.ic:
  Applied innodb-4.1-ss26 snapshot.
   Remove too strict assertions from some dict_table_t
   accessor functions (Bug#19366).

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


VC++Files/mysql.sln:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/tztime.h:
  Auto merged
tests/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

supplied inside a  /*!VERSION event-text */  segment.  (Fixes Bug#18078


mysql-test/t/disabled.def:
  Enabling 'mysqldump' test because events should load normally now.
mysql-test/t/mysqldump.test:
  Add spaces and tabs to the end of statements, to prove trimming of 
  whitespace.
sql/event_timed.cc:
  Remove  */  close-comment characters at the end, just as sp_head does.
      
  The parser should be smarter about not giving us text that jumps semantic 
  levels, but that's an issue for another day.

into  zim.(none):/home/mikael/bug19313


sql/sql_table.cc:
  Auto merged

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

mysys/cmakelists.txt:
  Add new file to build.
tests/cmakelists.txt:
  Add new dependency on mysys

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


mysql-test/r/xml.result:
  Auto merged
mysql-test/t/xml.test:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged

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


BitKeeper/etc/config:
  Auto merged
VC++Files/mysql.sln:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/tztime.h:
  Auto merged
tests/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

BitKeeper/etc/config:
  pekka:get

into  mysql.com:/home/dlenev/mysql-5.1-merges


VC++Files/mysql.sln:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/tztime.h:
  Auto merged
tests/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

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

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667

mysql-test/r/information_schema.result:
  Fixing test case result (after modifying the size of the
   i_s.processlist.info column).
sql/mysql_priv.h:
  Defined new constant used as the size of the
   i_s.processlist.info column.
sql/sql_show.cc:
  Modifying sizes of i_s.processlist columns ('time', 'info').

Logging behavior changed in early 5.1.  (The filename was never right, but
the "opt" file is unnecessary in 5.0 anyway.)


mysql-test/t/mysql_client_test-master.opt:
  Logging behavior changed in early 5.1.

config/ac-macros/plugins.m4:
  WL#3201
    fixup dynamic-only plugin support.
sql/log.cc:
  fixup static initializers

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


include/my_sys.h:
  Auto merged
mysys/Makefile.am:
  Auto merged
tests/Makefile.am:
  Auto merged

our sprintf()-alike in sync with our fprintf()-alike features.


strings/my_vsnprintf.c:
  Advance the destination pointer properly.
  
  Also, pay attention to the "n" in snprintf() -- never write too much.

This will make charset code easier to understand


include/m_ctype.h:
  Fix spelling in comments
mysql-test/t/cast.test:
  Fix spelling in comments
mysql-test/t/query_cache.test:
  Fix spelling in comments
sql/sql_string.cc:
  Fix spelling in comments
strings/CHARSET_INFO.txt:
  Fix spelling in comments

into  mysql.com:/home/dlenev/mysql-5.0-bg11081

added I_S.REFARENTIAL_CONSTRAINTS table


mysql-test/r/information_schema.result:
  WL#2257 REFERENTIAL_CONSTRAINTS view
   result fix
mysql-test/r/information_schema_db.result:
  WL#2257 REFERENTIAL_CONSTRAINTS view
   result fix
mysql-test/r/information_schema_inno.result:
  WL#2257 REFERENTIAL_CONSTRAINTS view
   test case
mysql-test/t/information_schema_inno.test:
  WL#2257 REFERENTIAL_CONSTRAINTS view
   test case
sql/ha_innodb.cc:
  WL#2257 REFERENTIAL_CONSTRAINTS view

config/ac-macros/plugins.m4:
  remove unneccessary `ifelse'
  add comment, add missing dnl
configure.in:
  change description for heap engine
include/mysql/plugin.h:
  change macro name
sql/ha_berkeley.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_federated.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_heap.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_innodb.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_myisam.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_myisammrg.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_ndbcluster.cc:
  store strings statically for use in handlerton and plugin structures
sql/ha_partition.cc:
  store strings statically for use in handlerton and plugin structures
storage/archive/ha_archive.cc:
  store strings statically for use in handlerton and plugin structures
storage/blackhole/ha_blackhole.cc:
  store strings statically for use in handlerton and plugin structures
storage/csv/ha_tina.cc:
  store strings statically for use in handlerton and plugin structures
storage/example/ha_example.cc:
  store strings statically for use in handlerton and plugin structures

VC++Files/mysql.sln:
  mysql_client_test depends on mysys.
VC++Files/mysys/mysys.vcproj:
  Add new file missing in previous push.
mysys/my_memmem.c:
  Fix illegal pointer arithmetics on void *.
tests/Makefile.am:
  -L must go before -l
tests/mysql_client_test.c:
  No declarations after statement in C code.