into  mysql.com:/home/psergey/mysql-5.1-bugteam
  BUG#36139: manual merge


sql/item.cc:
  Auto merged
mysql-test/r/subselect.result:
  BUG#36139: Manual merge
mysql-test/t/subselect.test:
  BUG#36139: Manual merge

- Make convert_zerofill_number_to_string() take into account that the 
  constant it is converting may evaluate to NULL.


mysql-test/r/subselect.result:
  BUG#36139 "float, zerofill, crash with subquery"
  - Testcase
mysql-test/t/subselect.test:
  BUG#36139 "float, zerofill, crash with subquery"
  - Testcase

sql/share/errmsg.txt:
  Reverting error message to before merge.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/r/binlog_index.result:
  Manual merge

mysql-test/r/binlog_index.result:
  Result set change.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


sql/share/errmsg.txt:
  Manual merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge


sql/share/errmsg.txt:
  Manual merge.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/r/rpl_packet.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_packet.test:
  Auto merged

mysql-test/r/rpl_packet.result:
  Result change.
mysql-test/t/rpl_packet.test:
  Setting net_buffer_length correctly for the test instead of relying on it
  being set correctly. Waiting for slave to stop after issuing a SLAVE STOP
  and waiting for slave to start when issuing a SLAVE START to prevent race
  conditions causing test failure.

into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam

into  mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl

tables is not zero any more. For row-based logging, there is an extra commit
for sending rows changed by the statement to the binary log.


mysql-test/include/commit.inc:
  For row-based logging, an extra commit is done for each statement to commit
  non-transactional changes to the binary log.
mysql-test/r/commit_1innodb.result:
  Result change.

into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam


sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/share/errmsg.txt:
  merged 5.1-main to 5.1-bugteam

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge

into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam


storage/innobase/handler/ha_innodb.cc:
  Auto merged

into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam


include/my_dbug.h:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_test2.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged

into  amd64.(none):/src/bug26243/my51-bug26243


sql/tztime.cc:
  Null Merge

into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl


client/mysqltest.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

If a binlog file is manually replaced with a namesake directory the internal purging did
not handle the error of deleting the file so that eventually
a post-execution guards fires an assert.

Fixed with reusing a snippet of code for bug@18199 to tolerate lack of the file but no other error 
at an attempt to delete it.
The same applied to the index file deletion.

The cset carries pieces of manual merging.


mysql-test/r/binlog_index.result:
  new results
mysql-test/r/ctype_big5.result:
  results changed
mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result:
  new results
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  new results
mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test:
  cleanup. still todo: to let the test run multiple times w/o restarting the server (just ./mtr test)
mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result:
  results changed
mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test:
  guarding the test with statement format condition as the logics of the test requires
sql/log.cc:
  two changes. One for the bug, other manual merge.
  The bug change needs MYF(0) to pass to my_delete because not all error out of the function
  are critical. The finer check is done on the caller of my_delete similarly how it was implemented
  for bug@18199 fixes. Non-existance of a file is not a critical error.
sql/sql_class.cc:
  manual merge, removing extra automatically brought hunk.

into  macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam


mysys/mf_keycache.c:
  null-merge
sql/item_func.cc:
  null-merge
sql/lock.cc:
  null-merge
sql/sql_analyse.cc:
  null-merge
storage/csv/ha_tina.cc:
  null-merge
storage/myisam/mi_check.c:
  null-merge
storage/myisam/mi_keycache.c:
  null-merge

into  macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam


BitKeeper/deleted/.del-ha_berkeley.cc:
  null-merge
extra/charset2html.c:
  Auto merged
sql/mysqld.cc:
  null-merge
sql/sql_union.cc:
  null-merge

into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl


BitKeeper/deleted/.del-binlog_killed_simulate.result:
  Auto merged
BitKeeper/deleted/.del-show_binlog_events.inc:
  Auto merged
mysql-test/suite/rpl/r/rpl_user.result:
  Auto merged
storage/blackhole/ha_blackhole.cc:
  Auto merged
BitKeeper/deleted/.del-show_binary_logs.inc:
  Delete: mysql-test/include/show_binary_logs.inc
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  manual merge ul.
mysql-test/extra/binlog_tests/blackhole.test:
  manual merge
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  manual merge
sql/log.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_class.cc:
  manual merge

into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl


client/mysqltest.c:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged

mysql-test/suite/rpl/t/disabled.def:
  removing the line because there is no such test in the suite anymore.

into  macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam


configure.in:
  null merge
libmysql/libmysql.c:
  null merge
sql/ha_ndbcluster.cc:
  null merge
sql/ha_ndbcluster_cond.cc:
  null merge
sql-common/client.c:
  null merge
storage/federated/ha_federated.cc:
  null merge
storage/heap/hp_test2.c:
  SCCS merged
storage/innobase/handler/ha_innodb.cc:
  null merge
storage/myisam/mi_check.c:
  null merger
storage/myisam/mi_delete.c:
  null merge
storage/myisam/mi_dynrec.c:
  null merge
storage/myisam/mi_key.c:
  null merge
storage/myisam/mi_open.c:
  null merge
storage/myisam/mi_packrec.c:
  null merge
storage/myisam/mi_page.c:
  null merge
storage/myisam/mi_search.c:
  null merge
storage/myisam/mi_statrec.c:
  null merge
storage/myisam/mi_test1.c:
  SCCS merged
storage/myisam/mi_test2.c:
  null merge
storage/myisam/mi_test3.c:
  SCCS merged
storage/myisam/mi_write.c:
  null merge
storage/myisammrg/myrg_rkey.c:
  null merge
storage/ndb/src/ndbapi/DictCache.cpp:
  null merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
  null merge
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  null merge
storage/ndb/src/ndbapi/NdbOperationInt.cpp:
  null merge
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  null merge

into  amd64.(none):/src/bug26243/my51-bug26243


libmysql/libmysql.c:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  amd64.(none):/src/bug26243/my51-bug26243

into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-bt-merged


mysql-test/t/loaddata.test:
  Auto merged
mysql-test/r/loaddata.result:
  Manually merged.
sql/share/errmsg.txt:
  Manually merged.
sql/sql_load.cc:
  Manually merged.

into  amd64.(none):/src/bug26243/my51-bug26243

into  amd64.(none):/src/bug26243/my50-bug26243

  1. Use 'dat' extension, because it is handled in Makefile.am;
  2. Fix typo: the bug id is 35469, not 35649.


mysql-test/std_data/bug35469.dat:
  Rename: mysql-test/std_data/bug35649.data -> mysql-test/std_data/bug35469.dat
mysql-test/r/loaddata.result:
  Update result file.
mysql-test/t/loaddata.test:
  1. Use 'dat' extension, because it is handled in Makefile.am;
  2. Fix typo: the bug id is 35469, not 35649.