into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

master info structure.

 - winsock2.h must be included before windows.h

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-26093-merge

  results)

Before this fix, the function BENCHMARK() would fail to evaluate expressions
like "(select avg(a) from t1)" in debug builds (with an assert),
or would report a time of zero in non debug builds.

The root cause is that evaluation of DECIMAL_RESULT expressions was not
supported in Item_func_benchmark::val_int().

This has been fixed by this change.

into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl

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

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

into  quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl

into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl

into  quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl

into  quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl

when merging into 5.1.

into  quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings

Replacing local directory.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge

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

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

therefore the logic associated with it never worked.

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

Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
Positions of some binlog events were changed because of
additional logging of @@collation_database.

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

This patch fixes problem that LOAD DATA could use different
character sets when loading files on master and on slave sides:
- Adding replication of thd->variables.collation_database
- Adding optional character set clause into LOAD DATA

Note, the second way, with explicit CHARACTER SET clause
should be the recommended way to load data using an alternative
character set.
The old way, using "SET @@character_set_database=xxx" should be
gradually depricated.

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

into  quant.(none):/ext/mysql/bk/mysql-5.0-bug25306