After merge fix.

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

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  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1

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

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

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

into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27580

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

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

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

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

            m_status == DA_OK

Reading from information_scema.tables or information_schema.columns
may cause assertion failure in debug builds. This may happen under
rare circumstances when information_schema fails to get information
about a table (e.g. when a connection is killed).

This happens because open_normal_and_derived_tables() can return an
error without setting an error message in THD. But information_schema
attempts to get an error message from THD unconditionally.

With this fix information_schema attempts to get an error message
from THD only in case error message is set in THD.

into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
Additonal after merge fix

into  mysql.com:/home/bar/mysql-work/mysql-5.1-engines

into  mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2

Problem: libedit is a very pure-ASCII oriented library,
and it is not aware of extended (0x80..0xFF) or even multi-byte
characters. It considered such characters as non-printable
and didn't allow to input them.
Fix: make libedit think that all bytes >= 0x80 are printable.

into  trift2.:/MySQL/M51/mysql-5.1

into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt

into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime

Problem: logging of utf8-incompatible binary strings didn't work
Fix: hex-encoding of incompatible sequences.

READ_ONLY token was accidentally placed into wrong place
('ident' rule). The proper place is in the 'keyword_sp' rule.

The manual should be re-generated after this patch, because
the manual depends on the 'keyword_sp' rule.

into  buzz.(none):/home/davi/mysql-5.1-runtime

must match the order which they were declared in the class definition. 

Rename client_last_error to last_error and client_last_errno to last_errno
to not break connectors which use the internal net structure for error handling.

The problem is that passing anything other than a integer to a limit
clause in a prepared statement would fail. This limitation was introduced
to avoid replication problems (e.g: replicating the statement with a
string argument would cause a parse failure in the slave).

The solution is to convert arguments to the limit clause to a integer
value and use this converted value when persisting the query to the log.

sporadically.

(show_check.test fails sporadically).

Fix test case for Bug#12183 to make it stable.

into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime

to reach the desired value.

into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-build

            log-slave-updates and circul repl

After merge fixes.