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-hexdump

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

  After merge fix.

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

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

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

into mysql.com:/home/gluh/MySQL/Bugs/5.0.14089

  select distinct char(column) fails with utf8
ctype_utf8.result, ctype_utf8.test:
  Adding test case
sql_yacc.yy:
  Adding new syntax.
item_strfunc.h:
  Fixing wrong max_length calculation.
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0,
  according to Monty's suggestion.

                  information_schema is current database
  skip the check of I_S tables if table is derived table

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

into lmy004.:/work/mysql-5.0-bug12595-4

ESCAPE has length of 1 if specified and sql_mode is NO_BACKSLASH_ESCAPES
or has length of 0 or 1 in every other situation.
(approved patch applied on a up-to-date tree re-commit) 

into  mysql.com:/home/cps/mysql/trees/mysql-5.0

(v.2 with post-review fixes)

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

  Set the version number to 5.0.16

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1

ctype_utf8.test, ctype_utf8.result:
  Adding test case.
item.h:
item.cc:
  Adding Item_param::safe_charset_converter

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

  Bug#13238 mysqldump and mysqladmin hangs
  Avoid recursion into init_available_charsets.
  Serg's version didn't work for me: I got 
  double mutex locking.
  Pushing this version instead
  (It was approved by Serg anyway)

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

  Made yaSSL support an option (off by default)

into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0

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

Rename last_event_info to print_event_info to better reflect the new semantics

into  mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0

into  mysql.com:/home/alexi/dev/mysql-4.1-4375

Applying InnoDB patch from Jan Lindstrom

 during replication.
 Modified my_dir(). Now this function skips hidden and system
 files which sometimes are created by Windows.
 NOTE. The fix is similar to the previuos one (05 July 2004)
 except for correct setting of the 'attrib' variable value
 (within the previous fix this variable was left uninitialized
 when my_dir() was called with My_flags & MY_WANT_STAT == 0).

                 procedure
  For some functions returning strings (like "replace" and "ifnull" - where
  val_str() is returning a pointer into one of the parameters) - we ended
  up with a dangling pointer after the new operator destroyed the reuse item
  in the eval function.
  A working, if not very elegant, solution is to simply copy the string in
  such cases.

without database"

into mysql.com:/home/psergey/mysql-5.0-bug12915-merge