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


mysql-test/std_data/loaddata_dq.dat:
  Merge rename: mysql-test/std_data/loaddata5.dat -> mysql-test/std_data/loaddata_dq.dat
sql/item.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  Resolve conflicts, deal with renamed dat file
mysql-test/t/loaddata.test:
  Resolve conflicts, deal with renamed dat file

into  selena.:H:/MYSQL/src/#14137-mysql-5.0


sql/mysqld.cc:
  Auto merged

into  big_geek.:C:/Work/mysql/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

another macro defined in the Windows header files.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

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.


client/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.
mysql-test/t/mysqldump.test:
  sqldump.test:
      BUG# 12838
      New test to run mysqldump -x on a DB with views
mysql-test/r/mysqldump.result:
  BUG# 12838
      New test results for mysqldump -x on a DB with views

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


sql/sql_yacc.yy:
  Auto merged

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


sql/item_func.cc:
  Auto merged

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


sql/sql_parse.cc:
  Auto merged

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

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


sql/sql_yacc.yy:
  Auto merged

server-tools/instance-manager/instance.cc:
  terminate the new line buffer so our strcat's will work

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


sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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

mysys/base64.c:
  Converted into C code (not C++).

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

mysql-test/r/sp-error.result:
  Results for the test case for BUG#13037.
mysql-test/t/sp-error.test:
  Test case for BUG#13037.
sql/sql_base.cc:
  Polishing: use constant.
sql/sql_class.cc:
  Reset THD::where in THD::cleanup_after_query();
  Polishing: use the constant (THD::DEFAULT_WHERE).
sql/sql_class.h:
  Introduce a constant for the default value of THD::where.

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

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


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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.


mysql-test/r/select.result:
  Test for BUG#13832.
mysql-test/t/select.test:
  Test for BUG#13832.
sql/sql_yacc.yy:
  Fix for BUG#13832 - Unknown column t1.a in 'on clause'.
  
  List all join-related operators as having lower priority
  than the join operands to make the parser process join-
  related productions from left to right.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num


Makefile.am:
  Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num

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

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


sql/log_event.h:
  Auto merged

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

sql/log_event.h:
  One enum value per line
  Fixed a mistake
  Added values to every line for strange compilers

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.


mysql-test/r/sp.result:
  Results file for the test case for BUG#13095.
mysql-test/t/sp.test:
  Test case for BUG#13095.
sql/sql_lex.h:
  Added a variable to remember start of whole CREATE VIEW statement
  as well as start of its SELECT part.
sql/sql_prepare.cc:
  Allow CREATE VIEW and DROP VIEW to use in prepared statements.
sql/sql_view.cc:
  Use stored start of whole CREATE VIEW statement instead of thd->query,
  which differs from the original when prepared statement is executing.
sql/sql_yacc.yy:
  Remember start of whole CREATE VIEW statement as well as start of its
  SELECT part.

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


BitKeeper/deleted/.del-federated.disabled~9e4cca59f547174d:
  Delete: mysql-test/t/federated.disabled
mysql-test/t/disabled.def:
  disabled federated until bug 14272 is fixed.

OPTIMIZE TABLE.


sql/ha_innodb.cc:
  Fix for BUG#11704: "Found locks from different thread" warnings:
  The source of warnings was this scenario in OPTIMIZE:
    thr1: lock table with TL_WRITE_ONLY (InnoDB converts lock to TL_WRITE_ALLOW_WRITE)
    thr2: (UPDATE command) obtains a TL_WRITE_ALLOW_WRITE lock
    thr1: call mysql_lock_abort(). This function sets type of thr'1 lock to TL_WRITE_ONLY
    thr2: try to release thr2's lock. See two locks: TL_WRITE_ONLY, TL_WRITE_ALLOW_WRITE 
          and produce a warning.
  
  The fix: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in
  OPTIMIZE TABLE.

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


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged

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.


sql/log_event.h:
  Added numbering of enum values