into  four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddlx

some build machines during testing.

the SELECT in the test to only the expected rows. This helps
eliminate the possibility of spurious rows causing the test to
fail.

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

This patch removes the SLAVESIDE_DISABLED token from the event status clause
and adds the ability to mark an event as status = SLAVESIDE_DISABLED by using
the syntax DISABLE ON SLAVE instead.

The patch also adds tests to rpl_events to check the new syntax.

into  four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddlx

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

Fixing automerge problem and updating comments referring to exec_event().

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

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

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

- Eliminating some compiler warnings

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

into  mysql.com:/home/bar/mysql-5.0.b22638

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

This patch adds code to the binlog calls for replication of the
CREATE, DROP, and UPDATE event commands. An extra gate was added 
to ensure a query with length 0 is not binlogged. This corrects 
the problem of events_scheduling and rpl_events failing on some
build machines.

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

    
This patch changes test to remove Windows-specific limitations and potential
rounding errors in the calculation of a UDF.

Also corrects a minor merge conflict.

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

Adding an event that can be used to denote that an incident occured
on the master. The event can be used to denote a gap in the replication
stream, but can also be used to denote other incidents.

In addition, the injector interface is extended with functions to
generate an incident event. The function will also rotate the binary
log after generating an incident event to get a fresh binary log.

This patch corrects an error in the header file concerning a method declaration
in the header file. Compiles ok on Windows, but not on Linux. 

  
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command
for a series of tests.

The only code change is to correct references to the classname in
enums.

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

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

This patch corrects errors that occurred in a local manual merge as a result
of updating the local repository and includes changes necessary to correct 
problems found during the recalculation of next execution of events in RBR.

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge

into  mysql.com:/home/bar/mysql-5.1-new-rpl

Thanks to Gluh for suggestion.

into  mysql.com:/home/bar/mysql-5.0.b27079

into  mysql.com:/home/bar/mysql-5.1-new-rpl

into  mysql.com:/home/bar/mysql-5.0.b22378

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

Problem: SOUNDEX returned an invalid string for international
characters in multi-byte character sets.
For example: for a Chinese/Japanese 3-byte long character
_utf8 0xE99885 it took only the very first byte 0xE9,
put it into the outout string and then appended with three 
DIGIT ZERO characters, so the result was 0xE9303030 - which
is an invalide utf8 string.
Fix: make SOUNDEX() multi-byte aware and - put only complete
characters into result, thus return only valid strings.
This patch also makes SOUNDEX() compatible with UCS2.

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