into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl

SHOW BINLOG event. The latter should be either fixed or replaced to favor
reading from binlog as the check.


mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
  interminism of binlogging of multi-row insert delayed forced to relocate the show
mysql-test/r/binlog_row_binlog.result:
  new results

into  mysql.com:/usr/home/bar/mysql-5.1.20854

binlog_row_binlog.test failure in team tree.
Fixing the result.

into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl

ChangeSet@1.2309.1.12, 2006-09-12 15:42:13+02:00, guilhem@gbichot3.local +14 -0
  Fixing problems I identified in my auto_increment work pushed in July
  (as part of the auto_increment cleanup of WL #3146; ...
The problem is in that show binlog events in indeterministic, row events can be compressed,
so that 2 seconds original delay does not guard from inconsistency.

We syncronize test's current inserted rows counter with system insert delayed thread
per each query.

From another side there is no requirement for binlog to be event per row and then 
to verify if binlog has recorded what was recently inserted is better
via reading from it instead of 'show binlog events'. 


mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
  removing sleeps, syncronizing with system delayed thread per each statement,
  note that an insert statement is performed atomically including writing to binlog,
  so that concurrent selects are waiting. That's why the wait macro is safe.
mysql-test/r/binlog_row_binlog.result:
  new result
mysql-test/include/wait_until_rows_count.inc:
  macro implements waiting until a targeted table has a prescribed rows number.

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/disabled.def:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged
Docs/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged

into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl


BitKeeper/etc/ignore:
  auto-union

local file slipped into a previous commit, fixing ignore.


BitKeeper/etc/ignore:
  fixing a slip in previous bk citool invokation.

into  trift2.:/MySQL/M50/push-5.0

into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl


sql/log_event.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

Using move_field_offset() to move field pointer to other record before
calling pack()/unpack().


sql/log_event.cc:
  Using move_field_offset() to move the field pointer. It is necessary
  for unpack() and pack() of BIT fields to operate correctly.
  Adding debug printouts.
sql/sql_class.cc:
  Using move_field_offset() to move the field pointer. It is necessary
  for unpack() and pack() of BIT fields to operate correctly.
  Adding debug printouts to packing of update rows event.

Docs/manual.chm:
  BitKeeper file /MySQL/M50/push-5.0/Docs/manual.chm

into  chilla.local:/home/mydev/mysql-5.0-toteam

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged

Fixed udf_example, so tests now can also run udf on win.


sql/udf_example.def:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.1-win/sql/udf_example.def
include/config-win.h:
  removed USE_32_BIT_TIME
include/my_time.h:
  Fixed size of my_time for Win64 (should be 64bit)
mysql-test/mysql-test-run.pl:
  Added windows paths for udf_example
sql/CMakeLists.txt:
  Added udf_example.dll
sql/udf_example.c:
  Windows doesn't know about socket.h and friends. Use winsock.h instead

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Manual merge 5.0->5.1
mysql-test/r/rpl_insert_id.result:
  Manual merge 5.0->5.1
mysql-test/r/rpl_stm_max_relay_size.result:
  Manual merge 5.0->5.1
mysql-test/t/rpl_insert_id.test:
  Manual merge 5.0->5.1

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


mysql-test/r/rpl_insert_id.result:
  Merge 4.1-5.0
mysql-test/r/rpl_max_relay_size.result:
  Merge 4.1-5.0
mysql-test/t/rpl_insert_id.test:
  Merge 4.1-5.0
mysql-test/t/rpl_max_relay_size.test:
  Merge 4.1-5.0

mysql-test/r/rpl_insert_id.result:
  Updated result file

Setting default database back to 'test', so that next test case don't use the wrong database


mysql-test/r/rpl_insert.result:
  result file update

Added master-slave synchronization to make sure truncate happen before slave manipulations on every platform

into  chilla.local:/home/mydev/mysql-5.0-toteam


sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-win

into  chilla.local:/home/mydev/mysql-5.1-tomain

Fix for win/Makefile.am


BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4:
  Delete: bdb/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740:
  Delete: myisam/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~4ef559bc8b4695f7:
  Delete: heap/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Delete: innobase/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~84669765249a4bad:
  Delete: myisammrg/CMakeLists.txt
win/Makefile.am:
  added missing support for 64-bit build file (make dist)

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/r/rpl_view.result:
  Auto merged
mysql-test/t/rpl_view.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge, merge trees 5.0->5.1

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/sql_yacc.yy:
  Auto merged

mysql-test/r/mysqldump.result:
  Fix of result file (adding the echo's)
mysql-test/r/rpl_view.result:
  Added end of 5.0 echo
mysql-test/t/rpl_view.test:
  Added end of 5.0 echo

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


client/mysqldump.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge, merge tree 5.0->5.1
mysql-test/r/rpl_view.result:
  Manual merge, merge tree 5.0->5.1
mysql-test/t/mysqldump.test:
  Manual merge, merge tree 5.0->5.1
mysql-test/t/rpl_view.test:
  Manual merge, merge tree 5.0->5.1

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/mysqldump.result:
  Restoring rpl tree mysqldump test file to main tree test files
mysql-test/r/status.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Restoring rpl tree mysqldump test file to main tree test files

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
client/mysqldump.c:
  Merge main->rpl
mysql-test/r/mysqldump.result:
  Restore of main mysqldump test files in rpl tree (only added echo and one test case for bug 13926)
  Printouts not yet added to result file
mysql-test/t/mysqldump.test:
  Restore of main mysqldump test files in rpl tree (only added echo and one test case for bug 13926)