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

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

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

into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bugBug27015-s_query_q_append

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

there is a way to miss allocation for the punctuation marks,
namely if (q == EOF) is true inside of append_identifier(), i.e in case names are not quoted
(not by default).

Replacing q_append with the method with reallocation if needed.

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

field does not work):

Enabling previously disabled test.

rows event):

Adding a after image COLS bitmap to Update_rows_log_event (for telling
what columns that are present in the after image of each row update).

Also fixing case where Rows_log_event length was not correctly computed
(happened when the number of columns in a table was more than 251). 

- Fixing utf8_general_cs according to recent changes.
- Compiling utf8_general_cs in pentium-debug-max configuration
  to avoid these problems in the future.

into  trift-lap.fambruehe:/MySQL/M51/push-5.1

Fix: adding namespace reference into "mysql --xml" output,
to make it work similary to "mysqldump --xml".

Problem: GROUP BY on empty ucs2 strings crashed server.
Reason: sometimes mi_unique_hash() is executed with
ptr=null and length=0, which means "empty string".
The branch of code handling UCS2 character set
was not safe against ptr=null and fell into and
endless loop even if length=0 because of poiter
arithmetic overflow.
Fix: adding special check for length=0 to avoid pointer arithmetic
overflow.

into  zim.(none):/home/brian/mysql/pread-archive-5.1

Centralized init logic for starting a scan.