into  mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1-release

  Add ChangeLog if it exists
  - Removed separate 'normal+rowrepl' test run, not needed any longer
  - Removed separate 'rpl' test run, included in main test run already
  - Renamed some test "comments", to use similar naming style
  - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites
  - Reordered test runs, to be aligned with Windows test runs
mysql.spec.sh:
  - No longer including the "Example" storage engine
  - Added to configure "--without-ENGINE" if not to compile engine as plugin


Docs/Makefile.am:
  Add ChangeLog if it exists
Makefile.am:
  - Removed separate 'normal+rowrepl' test run, not needed any longer
  - Removed separate 'rpl' test run, included in main test run already
  - Renamed some test "comments", to use similar naming style
  - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites
  - Reordered test runs, to be aligned with Windows test runs
support-files/mysql.spec.sh:
  - No longer including the "Example" storage engine
  - Added to configure "--without-ENGINE" if not to compile engine as plugin

Among two claimed artifacts the critical one is in that the Table map of 
a query following the failing with a duplicate key error CREATE-SELECT is skipped from
instantionating (and thus binlogging). That leads to sending a "chopped" group of the data
row-events without the table map head to the slave. 
The slave can not apply the only data row events.
It's not easy to force the slave to react with an error in such a case (the second complaint
on the bug report), because the lack of a table Rows_log_event::do_apply_event the data row event
handler is a common situation which  normally designates the event has to be filtered out
basing on the repliation do/ingore rules decision.

Fixed: table map creating and binlogging is restored via deploying the standard cleanup call in
select_create::abort().
No error is reported if by chance the table map was not been binlogged.
Leaving this out to resolve with considering how to combine the do/ingore rules with the situation
when erronoulsy the Table_map is not written to binlog.


mysql-test/suite/rpl/r/rpl_row_create_table.result:
  results changed
mysql-test/suite/rpl/t/rpl_row_create_table.test:
  regression test for the bug
sql/sql_insert.cc:
  adding resetting of thd binlogging state that was missed for the particular case of failing CREATE..SELECT

Problem: SELECTs prohibited for a transactional SE in autocommit mode
if read_only is set.

Fix: allow them.


mysql-test/r/read_only_innodb.result:
  Fix for bug #35732: read-only blocks SELECT statements in InnoDB
    - test result.
mysql-test/t/read_only_innodb.test:
  Fix for bug #35732: read-only blocks SELECT statements in InnoDB
    - test case.
sql/handler.cc:
  Fix for bug #35732: read-only blocks SELECT statements in InnoDB
    - in autocommit mode thd->transaction.all list is empty thus 
      is_real_trans set to TRUE for any SELECTs, so using it in the
      "read_only" check is insufficient.
      ha_check_and_coalesce_trx_read_only() changed to return number
      of engines with read-write changes. This value is used in the
      "read-only" check and checks for GLOBAL READ LOCK.
sql/lock.cc:
  Fix for bug #35732: read-only blocks SELECT statements in InnoDB
    - added assert(protect_against_global_read_lock) before decreasing,
      in order to catch (uint) 0 - 1 situation due to wrong 
      wait_if_global_read_lock()/start_waiting_global_read_lock() call
      sequence.

The problem is that when upgrading the event table, the sql_mode
column was always being added instead of being updated to list new
sql_mode values, causing upgrades of the event which already have
a sql_mode column to not be updated to the new sql_mode values.

The solution is to always add first a stub sql_mode column and
subsequently update the column to the new sql_mode values.


scripts/mysql_system_tables_fix.sql:
  Always add and update the sql_mode column of the event table.

  If excluding Federated, make sure dynamic plugin is not built
Makefile.am:
  Only run cluster test when compiled with cluster
lib_sql.cc:
  Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()


Makefile.am:
  Only run cluster test when compiled with cluster
libmysqld/lib_sql.cc:
  Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()
support-files/mysql.spec.sh:
  If excluding Federated, make sure dynamic plugin is not built

  Corrects build problems embedded on Windows
Makefile.am:
  Install .sym or mysqld-debug if exists
query_cache_debug.test, query_cache_debug.result:
  Set more resonable query cache size (bug#35749)
CMakeLists.txt:
  Added missing stacktrace.c


mysql-test/r/query_cache_debug.result:
  Set more resonable query cache size (bug#35749)
mysql-test/t/query_cache_debug.test:
  Set more resonable query cache size (bug#35749)
libmysqld/CMakeLists.txt:
  Added missing stacktrace.c
sql/Makefile.am:
  Install .sym or mysqld-debug if exists
sql/mysqld.cc:
  Corrects build problems embedded on Windows

into  five.local.lan:/work/mysql-5.1-24-rc

Problems were caused by modifications of
- the server
  - HANDLER FOR SQLSTATE '00000' is now rejected (bug fix)
    affects several ..._storedproc* tests
  - improved error message
    affects the ..._trig_03e
  - improved content of information_schema.COLUMNS about
    information_schema.REFERENTIAL_CONSTRAINTS
    affects is_columns_is
- the content of the community build (collations)
    affects charset_collation_3 


mysql-test/suite/funcs_1/r/charset_collation_3.result:
  Updated result
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
  Updated result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Updated result
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
  Updated result
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Updated result
mysql-test/suite/funcs_1/r/memory_storedproc.result:
  Updated result
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Updated result
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Updated result
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
  Updated result
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Updated result
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_storedproc.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result:
  Updated result
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Updated result
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
  Corrected script
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
  Corrected script

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1.24-release

mysql-test/include/master-slave-reset.inc:
  Adding missing waits for slave to start and stop causing test failures.
mysql-test/suite/rpl/t/rpl_insert.test:
  Waiting for the rows to be inserted instead of relying on the binlog position
  to be updated correctly.

sql/set_var.cc:
  Unbreak REPORT_PORT on big endian machines where sizeof long != sizeof int.

  Made Federated and Cluster optional


support-files/mysql.spec.sh:
  Made Federated and Cluster optional

  Disabled 'rpl_redirect', failure is sporadic and and the test is superfluous
rpl_packet.test, rpl_packet.result:
  Removing race conditions from rpl_packet causing test to fail


mysql-test/suite/rpl/t/disabled.def:
  Disabled 'rpl_redirect', failure is sporadic and and the test is superfluous
mysql-test/suite/rpl/r/rpl_packet.result:
  Result change.
mysql-test/suite/rpl/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  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