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

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

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

conflicts without proper analysis and documentation of the nature of
the conflict.

master info structure.

 - winsock2.h must be included before windows.h

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

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  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge

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

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

into  weblab.(none):/home/marcsql/TREE/mysql-4.1-runtime

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

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

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

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

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

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