into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


ndb/src/ndbapi/NdbUtil.hpp:
  Auto merged

into  zim.(none):/home/brian/mysql/archive-move

sql/ha_archive.h:
  Rename: sql/examples/ha_archive.h -> sql/ha_archive.h
libmysqld/Makefile.am:
  Moved archive files references
sql/Makefile.am:
  Moved archive from example to sql
sql/ha_archive.cc:
  Moved location of prov file.
sql/handler.cc:
  Moved location from examples to sql

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
os2/MySQL-Source.icc:
  Auto merged
regex/Makefile.am:
  Auto merged
regex/engine.c:
  Auto merged
regex/main.c:
  Auto merged
regex/regerror.c:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
my_regex.h:
  Rename: regex/regex.h -> regex/my_regex.h


client/mysqltest.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
os2/MySQL-Source.icc:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/Makefile.am:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/debug.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/debug.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/engine.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/engine.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/main.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/main.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regcomp.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regerror.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regerror.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/my_regex.h:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regexec.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regfree.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/reginit.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
sql/item_cmpfunc.cc:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
sql/item_cmpfunc.h:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
sql/mysqld.cc:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.

  Append to some of the log files, not overwrite


mysql-test/lib/mtr_process.pl:
  Append to some of the log files, not overwrite

  Append to some of the log files, not overwrite.
  Changed introduction text to reflect the current
  status of the Perl version of mysql-test-run.
  Some code cleanup.


mysql-test/mysql-test-run.pl:
  Append to some of the log files, not overwrite.
  Changed introduction text to reflect the current
  status of the Perl version of mysql-test-run.
  Some code cleanup.

  Pass on all --skip-* to mysqld


mysql-test/mysql-test-run.pl:
  Pass on all --skip-* to mysqld

client/mysqltest.c:
  Auto merged

into  mysql.com:/space/pekka/ndb/version/my50

ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  more checks and options

  After merge fix for bug#13356


sql/item.cc:
  After merge fix for bug#13356
mysql-test/r/select.result:
  After merge fix for bug#13356

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


libmysqld/lib_sql.cc:
  Auto merged

BUILD/SETUP.sh:
  BUG #13511, wrong patch pushed, fixing.

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

--with-embedded-privilege-control options". One more (hopefully last) build
failure which was introduced during work on WL#2787 "Add view definer/owner
to the view definition..."


libmysqld/lib_sql.cc:
  create_embedded_thd()/check_embedded_connection():
    Several security related THD members (user, host, ip, priv_user, ...) have
    moved to the Security_context class. New THD::security_ctx member points to
    active security context.
sql/sql_acl.cc:
  acl_getroot():
    Updated function description to refelect the fact that THD::user/host/ip/...
    members were moved to separate Security_context class.
sql/sql_parse.cc:
  check_user():
    Updated function description to refelect the fact that THD::user/host/ip/...
    members were moved to separate Security_context class.

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


BitKeeper/deleted/.del-disabled.def:
  Delete: mysql-test/t/disabled.def
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
mysql-test/r/innodb.result:
  Manual merge from 4.1 to 5.0
mysql-test/r/select.result:
  Manual merge from 4.1 to 5.0
mysql-test/t/select.test:
  Manual merge from 4.1 to 5.0
sql/item.cc:
  Manual merge from 4.1 to 5.0

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

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

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


libmysqld/lib_sql.cc:
  Auto merged

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

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

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

into  127.(none):/home/osku/mysql/5.0/13497

  Added -lz to link using libmysqld


scripts/mysql_config.sh:
  Added -lz to link using libmysqld

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

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

mysql-test/r/cast.result:
  Move the warning to corecct place

into  127.(none):/home/osku/mysql/5.0/clean

innobase/os/os0proc.c:
  Add UT_NOT_USED for parameters in dummy implementations of AWE functions.
sql/ha_innodb.cc:
  Tweak casts to eliminate compiler warnings.

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

consistent read (Bug #12669).


mysql-test/r/innodb.result:
  Added test results for a checksum test.
mysql-test/t/innodb.test:
  Added test case for a checksum bug #12669.
sql/ha_innodb.cc:
  Use consistent read for checksum table and convert MySQL lock type
  to the TL_READ because at the moment MySQL uses TL_READ_NO_INSERT.

  core dump on no free node id


ndb/tools/restore/consumer_restore.cpp:
  return correct value

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


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/sql_update.cc:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/r/cast.result:
  Manual merge
mysql-test/t/cast.test:
  Manual merge
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Manual merge
sql/ha_ndbcluster.cc:
  Manual merge
sql/item.h:
  Manual merge
sql/opt_sum.cc:
  Manual merge
sql/sql_delete.cc:
  Manual merge
sql/sql_lex.cc:
  Manual merge
sql/sql_load.cc:
  Manual merge
sql/sql_prepare.cc:
  Manual merge

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

(bug #13497).


innobase/buf/buf0buf.c:
  Print better error message when log files are missing/corrupt.

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main