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.

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

            log-slave-updates and circul repl

After merge fixes.

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

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

(Missed a change of printf format)

Fixed a missed case in the patch for Bug#31931.
Also makes Bug#33722 a duplicate of Bug#31931.
Added tests for better coverage.
Replaced some legacy function calls.

Test file fixes for bugs 20129, 31931 and 34225

into  witty.:/Users/mattiasj/clones/topush-51

into  witty.:/Users/mattiasj/clones/topush-51

into  mysql.com:/home/ram/work/b33304/b33304.5.0

into  mysql.com:/home/ram/work/b33304/b33304.5.1

            log-slave-updates and circul repl

Slave SQL thread may execute one extra event when there are events
skipped by slave I/O thread (e.g. originated by the same server).
Whereas it was requested not to do so by the UNTIL condition.

This happens because we compare with the end position of previously
executed event. This is fine when there are no skipped by slave I/O
thread events, as end position of previous event equals to start
position of to be executed event. Otherwise this position equals to
start position of skipped event.

This is fixed by:
- reading the event to be executed before checking if the until condition
  is satisfied.
- comparing the start position of the event to be executed. Since we do
  not have the start position available, we compute it by subtracting
  event length from end position (which is available).
- if there are no events on the event queue at the slave sql starting
  time, that meet until condition, we stop immediately, as in this
  case we do not want to wait for next event.

into  xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.1

into  xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.1

into  xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.0

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

ndb data to be logged has made it to the binary log to get a deterministic
behavior on the rotation of the log.

into  xiphis.org:/anubis/antony/work/p1-bug34598.2.merge.1

  "crash on hpita: Invalid address alignment"
  Replace dangerous pointer arithmetic - it may occurr where sizeof(int) is
  less than size of machine alignment requirement.

into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge

            breaks replication

NAME_CONST() didn't replicate constant character set and collation
correctly.

With this fix NAME_CONST() inherits collation from the value argument.

into  mysql.com:/home/ram/work/b33304/b33304.5.1

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

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

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

Problem: SLEEP(0) never returns on 64-bit Mac OS X due to a bug in 
pthread_cond_timedwait().

Fix: when given a very short timeout just return immediately.

failing on heavily loaded systems.

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

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