we are using the NO_BACKSLASH_ESCAPES SQL mode. (Bug #6368)

Adjust test results for BUG#7634: The result of EXPLAIN is different if OS doesn't support file sizes > 2G

into hundin.mysql.fi:/home/marko/mysql-5.0

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/wl1967

  Support for COMMIT/ROLLBACK optional arguments

into bob.(none):/home/reggie/bk/mysql5.0

into bob.(none):/home/reggie/bk/mysql5.0

  --with-uca configure.in argument.
  The rest of the changes are pending from 4.1 tree

perror.c:
  Copy output of strerr to temp buffer to prevent system overwrite on Windows

into bob.(none):/home/reggie/bk/mysql5.0

into bob.(none):/home/reggie/bk/mysql5.0

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

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

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

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

sql_table.cc:
  use fn_format to resolve symlinks in mysql_create_like_table

  Fix for merge from 4.1

  Merge from 4.1

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug7011.4

  Fix tests after merge from 4.0

  Merge from 4.0

+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1

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

into hundin.mysql.fi:/home/marko/k/mysql-4.1

  Fix replication for multi-update
  new test - rpl_multi_update2

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

into sinisa.nasamreza.org:/mnt/work/petica

into mysql.com:/home/dlenev/src/mysql-5.0-merges

into mysql.com:/home/dlenev/src/mysql-4.1-tzbug

into mysql.com:/home/dlenev/src/mysql-5.0-merges

into bob.(none):/home/reggie/bk/mysql41