into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-engines

When there are no underlying tables specified for a merge table,
SHOW CREATE TABLE outputs a statement that cannot be executed. The
same is true for mysqldump (it generates dumps that cannot be
executed).

This happens because SQL parser does not accept empty UNION() clause.

This patch changes the following:
- it is now possible to execute CREATE/ALTER statement with
  empty UNION() clause.
- the same as above, but still worth noting: it is now possible to
  remove underlying tables mapping using ALTER TABLE ... UNION=().
- SHOW CREATE TABLE does not output UNION() clause if there are
  no underlying tables specified for a merge table. This makes
  mysqldump slightly smaller.

into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines

            log-slave-updates and circul repl

This is a test case fix for BUG#13861.

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

When concurrent inserts were disabled, statements after an INSERT
were not put into the query cache. This happened because we do not
save the current data file length at statement start when
concurrent inserts are disabled. But we checked the always zero
local length against the real file length anyway.
  
Fixed by doing the check only if concurrent inserts are not diabled.

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

  
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.

The test file tried to use a mysqltest command '--warning'
but there is no such command.

Changed '--warning' to '#--warning'.

bug12713.

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  kaamos.(none):/data/src/opt/mysql-5.0-opt

into  kaamos.(none):/data/src/opt/mysql-5.0-opt

into  kaamos.(none):/data/src/opt/mysql-4.1-opt

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

into  riffraff.(none):/data0/martin/bug34367/my51-bug34367-pushee

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  mysql.com:/home/hf/work/32801/my51-32801

Post-pushbuild fixes. Added purecov comments.