SQL_SLAVE_SKIP_COUNTER is possible):

By setting the SQL_SLAVE_SKIP_COUNTER it was possible to start the
from the middle of a group. This patch adds code so that events that
do not end a statement are ignored instead of skip counted when the
slave skip counter is 1.

into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl

This patch corrects a problem encountered when reading the binlog from a remote
host. The application was crashing because the buffer variable (temp_buf) in 
log_event was not pointing to the incoming data. For a normal file read, this 
buffer is allocated by a previous call of read_log_event. However, when reading
from a remote host, the first call to read_log_event is not executed therefore
no buffer is allocated. Furthermore, there is no need to allocate a new buffer 
because the incoming stream is what needs to be read. 

This patch adds the call to initialize the temp_buf variable if reading from a 
remote host. It also adds a check at destroy time to ensure the temp_buf is not
freed if reading from a remote host.

Replacing binlog_row_based_if_mixed with variable binlog_stmt_flags
holding several flags and adding member functions to manipulate the
flags.

Added code to generate a warning when an attempt to log an unsafe
statement to the binary log was made. The warning is both pushed to the
SHOW WARNINGS table and written to the error log. The prevent flooding
the error log, the warning is just written to the error log once per
open session.

into  mysql_cab.:C:/source/c++/mysql-5.1_BUG_17233

This patch corrects a bug involving a LOAD DATA INFILE operation on a 
transactional table. It corrects a problem in the error handler by moving
the transactional table check and autocommit_or_rollback operation to the 
end of the error handler. 

The problem was an assert was thrown after the operation completed. The 
assert found a non-sunk event in the transaction cache. The events in the 
transaction cache were added after commit_or_rollack and thereafter nothing 
removed them.

An additional test case was added to detect this
condition.

into  mysql.com:/home/bar/mysql-5.1.b26518

Problem: XPath variables didn't work.
Fix: adding variables support,
both user-defined and sp local variables are now supported by XPath.

into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_18980

Failure was not reproduced under testing with the latest clone.
This patch re-enables the test.

Problem: when replacing the root element, UpdateXML
erroneously tried to mix old XML content with the
replacement string, which led to crash.
Fix: don't use the old XML content in these cases,
just return the replacement string.

Reason:
   This test executes DML statements on a NDB table to detect if some SQL statements of special interest commits the ongoing transaction.
   When running in MIXED mode, automatic switching from statement-based to row-based replication takes place when a DML statement
   updates an NDB table.
   That means running this test on NDB with binlog-format=mixed and binlog-format=row mostly checks the same routines twice.
   Therefore we skip the variant with binlog-format=mixed.

The combination NDB and statement based replication is extreme slow and this fails usually because of testing timeout.

The fix for   Bug#18946: Test case rpl_ndb_ddl disabled   pushed around end of March 2007 enabled this testcase.
It was later disabled because the test failed with timeout on one testing box.
The reason for this failing test could not be found because we do not have informations about the conditions on the box during this test.
Jeb and I tried this test on other boxes and it passed.
My experience is that
- tests using NDB need in general often significant more runtime
  than comparable tests of other storage engines
- the actual load of the box where the test is running and the
  filesystem (nfs could be extreme slow) where the tests are
  executed might have a huge impact on the test performance 
  (runtime * 2 till 3)
- there are sometimes problems with the ports most probably
  caused by OS properties (NDB+RPL need many ports) or
  parallel tests accidently running with the same ports.
AFAIK these are the reasons why the NDB tests fail sometimes with timeout.
Conclusion: We enable rpl_ndb_ddl again because the failure happens in rare cases
and seems not to be caused by errors within the server or test code. 

into  romeo.(none):/home/bk/merge-mysql-5.1

into  romeo.(none):/home/bk/merge-mysql-5.1

into  romeo.(none):/home/bk/merge-mysql-5.0

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

into  romeo.(none):/home/bk/b27779-mysql-5.1-rpl

revert back to old show_binlog_events asto many test failures, and create a show_binlog_events2 instead

 - test case

- both for data schema operations
- also make sure schema events vet the right server id when injected into the binlog
- use same mechanism to signal server_id in bug#17095, and reserve some "id's" for flagging special conditions on the event, in this case do not log it
- enable printing of server ids in the testcases to show that we cot it right

- make sure any value is set for linked operations as well, e.g. blob tables

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel

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

into  mysql.com:/home/my/mysql-5.1

(Removes some warnings about UNIX_TIMESTAMP from the slave.err logs)
Marked federated_server as a '--big-test'
Change error in net_clear to 'Note', as it interfered with mysql-test-run.

compile warnings on windows machines.

refining the test with active innodb

tests for the bug and associated is moved into another file because
they appeared to be binlog-format sensitive.

Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"

into  romeo.(none):/home/bk/b27779-mysql-5.1-rpl

  After merge fix.