in NDB that the fix would cause due to improper registration of a transaction
that isn't meant to be seen by the handler layer. (Bug #14212)

Thanks to Sergei Golubchik for helping with this.

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  asksasha.com:/reiser-data/mysql-dev/mysql-5.0-bug12974

into mysql.com:/data0/mysqldev/patg/mysql-5.0-viewfix

mysqldump.result:
  BUG# 12838
      New test results for mysqldump -x on a DB with views
mysqldump.test:
  sqldump.test:
      BUG# 12838
      New test to run mysqldump -x on a DB with views
mysqldump.c:
  BUG# 12838
      Removed/Changed code which created tables to be put into the dump
      (For loading views of views) by creating temp tables and then using
      the CREATE TABLE information in those temp tables. The problem with this
      is that when mysqldump -x is called, it locks all tables, so the
      temp tables could not be created, causing the mysqldump to exit with
      failure. The code was changed to use SHOW FIELDS to get the column
      names and type to build CREATE TABLE text used to create these tables
      that views need in the dump.

into deer.(none):/home/hf/work/mysql-5.0.12267

into deer.(none):/home/hf/work/mysql-5.0.12267

into deer.(none):/home/hf/work/mysql-5.0.12267

into deer.(none):/home/hf/work/mysql-5.0.12267

into  zim.(none):/home/acurtis/mysql-5.0-noraid.2

into deer.(none):/home/hf/work/mysql-5.0.12267

into  mysql.com:/usr/home/ram/work/5.0.b14207

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13037

into  mysql.com:/usr/home/ram/work/5.0.b10303

into  mysql.com:/home/timka/mysql/src/5.0-bug-13832

The cause for the bug is that the priorities of all rules/terminals
that process the FROM clause are not fully specified, and the
parser generator produces a parser that doesn't always parse
the FROM clause so that JOINs are left-associative. As a result
the final join tree produced by the parser is incorrect, which
is the cause for subsequent name resolution to fail.

into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype

into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype

into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095

  - allow CREATE VIEW as well as DROP VIEW to use in prepared statements;
  - fix CREATE VIEW implementation to make it work in prepared statements.

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2

federated.disabled and instead using disabled.def (per
comments in this commit)

disabled.def:
  disabled federated until bug 14272 is fixed.
.del-federated.disabled~9e4cca59f547174d:
  Delete: mysql-test/t/federated.disabled
federated.disabled:
  New BitKeeper file ``t/federated.disabled'' to disable federated test until
  Bug 14272 is fixed.
  new file

OPTIMIZE TABLE.

into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64

different features, adding numbering to enums reduce the risk that code will
be merged incorrectly.  This particular enum must have fixed values to ensure
that an upgraded server always can read old logs.  I added this, since I 
noticed the incorrect order in the RBR clone.

into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump

into  mysql.com:/usr/home/ram/work/5.0.b10303

into  mysql.com:/usr/home/pem/bug13941/mysql-5.0

  After merge fix.

into  mysql.com:/usr/home/bar/mysql-5.0.b12371