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

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


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

  fixed warning in 5.1-marvel in fix for bug 25177


extra/perror.c:
  fixed warning in 5.1-marvel in fix for bug 25177

  added my_handler_errors.h


mysys/Makefile.am:
  added my_handler_errors.h

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


libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

sql/log.cc:
  Reordering initialalizer list to eliminate compiler warnings.

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

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


dbug/factorial.c:
  Auto merged
dbug/user.r:
  Auto merged
include/my_dbug.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
dbug/dbug.c:
  Null Merge
sql/mysqld.cc:
  Null Merge
sql/opt_range.cc:
  Null Merge
sql/set_var.cc:
  Null Merge
sql/slave.cc:
  Null Merge
storage/federated/ha_federated.cc:
  Null Merge
storage/myisammrg/ha_myisammrg.cc:
  Null Merge
client/mysql.cc:
  Manual Merge

- Backported the 5.1 DBUG to 5.0.
- Avoid memory cleanup race on Windows client for CTRL-C


client/mysql.cc:
  Bug#26243 mysql command line crash after control-c
  - On Windows, the sigint handler shouldn't call mysql_end
  because the main thread will do so automatically.
  - Remove unnecessary signal call from the sigint handler.
  - Call my_end with proper value.
dbug/dbug.c:
  Bug#26243 mysql command line crash after control-c
  - Backported the 5.1 DBUG library. The old version uses a non-thread 
  safe global variable 'static struct state *stack'.
dbug/factorial.c:
  Bug#26243 mysql command line crash after control-c
  - Backported the 5.1 DBUG library. The old version uses a non-thread 
  safe global variable 'static struct state *stack'.
dbug/user.r:
  Bug#26243 mysql command line crash after control-c
  - Backported the 5.1 DBUG library. The old version uses a non-thread 
  safe global variable 'static struct state *stack'.
include/my_dbug.h:
  Bug#26243 mysql command line crash after control-c
  - Backported the 5.1 DBUG library. The old version uses a non-thread 
  safe global variable 'static struct state *stack'.
libmysql/libmysql.c:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
myisam/mi_open.c:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
sql/ha_federated.cc:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
sql/ha_innodb.cc:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
sql/ha_myisammrg.cc:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
sql/item_cmpfunc.cc:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
sql/mysqld.cc:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
sql/net_serv.cc:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
sql/opt_range.cc:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
sql/set_var.cc:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
sql/slave.cc:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
sql/sql_cache.cc:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
sql/sql_select.cc:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.
tests/mysql_client_test.c:
  Bug#26243 mysql command line crash after control-c
  - Update for new DBUG library.

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


sql/sql_insert.cc:
  Auto merged

mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result:
  Result change.
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
  Result change.
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
  Result change.
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
  Removing rows causing tests to be non-deterministic.

  in perror and handler descriptors (BUG#25177)
Fixed problem of masking mysql error by system
  error in perror (BUG#23028)


extra/perror.c:
  Used common handlers error list.
  Fixed BUG#23028 ignoring mysql error in case of
  OS and mysql error codes overlapping.
include/my_base.h:
  Added errors of maria engine.
  Fixed incorrect comment in #define (can be cause of
  seriouse problems)
include/my_handler.h:
  Added ability to be included into C++ code.
mysys/my_handler.c:
  Error texts moved to the separate files.
mysys/my_handler_errors.h:
  New BitKeeper file ``mysys/my_handler_errors.h''

into  moonbone.local:/work/27219-bug-5.1

improving a test that shows a failure.

the wait condition was for data in tables but the 
log positions are updates after the data are unlocked.
So there was a time window
[after_table_unlock_for_select, log_pos_updated] where the
orig cond was true but log position might be changed.
the correct one is to expect the last pos of the
slave's insert in the output of show_slave_status on the
master.


mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
  refining a sychronization condition (2 times)