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

into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/event_timed.cc:
  Auto merged

sql/event_timed.cc:
  Added support for new parser function
sql/sql_partition.cc:
  Change calling parser name.

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


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

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

This patch does 1) fix my build breakage  2) Complete the removal of all symbols which could clash with another parser. 


sql/mysql_priv.h:
  Porting update
sql/mysqld.cc:
  Porting update
sql/sp.cc:
  Porting update
sql/sql_lex.cc:
  Porting update
sql/sql_lex.h:
  Porting update
sql/sql_parse.cc:
  Porting update
sql/sql_prepare.cc:
  Portinng update
sql/sql_trigger.cc:
  Porting update
sql/sql_view.cc:
  Porting update

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

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

into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/mysqldump.test:
  Auto merged

the '-E' or '--events' flag.  (Closes Bug#16853 and Bug#17714.)


WARNING:

At present, these tests fail due to b*g number 18078.


client/mysqldump.c:
  Added code to dump events, when asked to do so via the --events parameter.
  
  Also cleaned up some surrounding code.
mysql-test/r/mysqldump.result:
  Added a test to create an event, dump it, restore it, add more events, dump
  all of them, and restore all of them.
mysql-test/t/mysqldump.test:
  Added a test to create an event, dump it, restore it, add more events, dump
  all of them, and restore all of them.
sql/event_timed.cc:
  No longer qualify SHOW CREATE EVENT names with the database name.
BitKeeper/etc/ignore:
  Removing accidentally 'ignored' bogus file entry.

into sunlight.local:/work_local/17726-bug-5.1-new-mysql


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

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


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


mysql-test/t/mysqltest.test:
  Auto merged

  Fix typos.


mysql-test/t/mysqltest.test:
  Fix typos.

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


configure.in:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into moonbone.local:/work/17726-bug-5.1-new-mysql


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

Makes you wonder what I am up to, doesn't?


configure.in:
  Adjusts bison to not create symbols that clash.
sql/sql_analyse.cc:
  Adding define to make sure sql_yacc.h gets included.
sql/sql_lex.cc:
  Fixing it so that sql_yacc.h is included
sql/sql_lex.h:
  Fixing include rules
sql/sql_parse.cc:
  Adding flag to compile sql_yacc.yy

mysql-test/r/trigger-grant.result:
  Updated the result file.
mysql-test/r/view_grant.result:
  Updated the result file.
mysql-test/t/trigger-grant.test:
  A patch for BUG#13198 has been merged, so need to update the test case.
mysql-test/t/view_grant.test:
  A patch for BUG#16777 has been merged, so need to update the test case.
sql/sql_parse.cc:
  After-merge fix (should have been a part of fix for BUG#16777).
sql/sql_show.cc:
  After-merge fix -- empty identifier should be quoted.

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_ddl.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/skip_grants.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Manually merged.
sql/sp.cc:
  Manually merged.
sql/sql_yacc.yy:
  Manually merged.

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

mysql-test/t/disabled.def:
  Orginize file order

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

mysql-test/r/rpl_ndb_blob.result:
  test case for varsize PK + blob
mysql-test/t/rpl_ndb_blob.test:
  test case for varsize PK + blob
storage/ndb/include/ndbapi/NdbBlob.hpp:
  table PK in blob part key is fixed-sized so keep extra bytes zero if varsize PK
storage/ndb/src/ndbapi/NdbBlob.cpp:
  table PK in blob part key is fixed-sized so keep extra bytes zero if varsize PK

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  Updated results
rpl_ndb_dd_advance.test:
  Updated test case from comments in Tomas's review
  Changes bug number comment


mysql-test/t/rpl_ndb_dd_advance.test:
  Updated test case from comments in Tomas's review
mysql-test/r/rpl_ndb_dd_advance.result:
  Updated results

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  split pk: over-eager assert in varsize PK case

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

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

sql/ha_ndbcluster_binlog.cc:
  Bug #18106  	Ndb: Online add index together with replication may cause mysqld core
  - move initialization of Ndb share ndb_values from ndbcluster_binlog_open_table to
    ndbcluster_binlog_init_share so that ndbcluster_binlog_open_table can be used for reinitializing
    after frm change
  - free table share on remote mysqld on online alter (call ndbcluster_binlog_close_table)
  - free share before calling ndb_create_table_from_engine to be able to handle trailing share correctly
  + debug printouts
  + extra nulling of some variables
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Bug #18106  	Ndb: Online add index together with replication may cause mysqld core
  - reinitialize event operation rec attrs after online schema change

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

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

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


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

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

storage/ndb/include/ndbapi/NdbBlob.hpp:
  fast fix bug#18075
storage/ndb/include/ndbapi/NdbOperation.hpp:
  fast fix bug#18075
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/NdbBlob.cpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/NdbBlobImpl.hpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  fast fix bug#18075
storage/ndb/src/ndbapi/ndberror.c:
  fast fix bug#18075
storage/ndb/test/ndbapi/testBlobs.cpp:
  fast fix bug#18075

into moonbone.local:/work/17726-bug-5.0-mysql


sql/item_cmpfunc.cc:
  Auto merged

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

mysql-test/t/rpl_trunc_temp.test:
  Test case only works with statement logging