(we should consider dropping 3.23 from this one soon)

into mysql.com:/space/my/mysql-5.0-build

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0

  Federated Storage Engine (as requested by Brian)
- added the federated storage engine to the Max Linux RPM


Build-tools/Do-compile:
  - added option "--with-federated" to enable building of the Federated
    Storage Engine (as requested by Brian)
support-files/mysql.spec.sh:
  - enabled the federated storage engine for the Max RPM subpackage

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


scripts/mysqlaccess.sh:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/vm/Configuration.cpp:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-4.1

ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove 8k->32k conversion
ndb/src/kernel/vm/Configuration.cpp:
  compute size in 32k pages directly

into build.mysql.com:/users/tulin/mysql-5.0-ndb


sql/sql_analyse.cc:
  Auto merged

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

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  take booked fragments into account before starting a new frag scan

into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0

  Use the invisible tabs (!)


libmysql/libmysql.def:
  Use the invisible tabs (!)
libmysqld/libmysqld.def:
  Use the invisible tabs (!)

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0

  Fix test result affected by error message rewording.
errmsg.txt:
  Reword error messages.
set_var.cc:
  Reorder variables.
mysqld.cc:
  Reorder options.


sql/mysqld.cc:
  Reorder options.
sql/set_var.cc:
  Reorder variables.
sql/share/errmsg.txt:
  Reword error messages.
mysql-test/r/user_limits.result:
  Fix test result affected by error message rewording.

into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0

  Add missing 'get_defaults_files' to fix linking error.


libmysql/libmysql.def:
  Add missing 'get_defaults_files' to fix linking error.
libmysqld/libmysqld.def:
  Add missing 'get_defaults_files' to fix linking error.

sql/sql_analyse.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

sql/sql_parse.cc:
  A shorter name for COM_EXECUTE command.

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

reported by Javier Fernandez-Sanguino Pena
and Debian Security Audit Team (http://www.debian.org/security/audit)

into build.mysql.com:/users/tulin/mysql-5.0-ndb

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/test/src/HugoTransactions.cpp:
  Auto merged

    search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
    not necessarily the same starts and stops...
    +error corrected in ref signal
    added print of error codes + more correct error handling of event errors
    + added goto instead of erroneous break to fix bug#7627


ndb/include/kernel/signaldata/SignalData.hpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  added som signal printout functions
ndb/src/kernel/blocks/suma/Suma.cpp:
  search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
  not necessarily the same starts and stops...
  +error corrected in ref signal
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  indentation
  event error handling
  debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  debug printouts
  + added goto instead of erroneous break to fix bug#7627
ndb/test/src/HugoTransactions.cpp:
  added print of error codes + more correct error handling of event errors

mysql-test/t/analyse.test:
  Added a note about the bug that this test case tests.
sql/sql_analyse.cc:
  Changed function description to standard format.

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0


sql/mysqld.cc:
  Auto merged

into build.mysql.com:/users/tulin/mysql-5.0-ndb

into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2


sql/opt_range.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

into build.mysql.com:/users/tulin/mysql-5.0

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0


sql/mysqld.cc:
  Auto merged

sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  resolve conflicts

into build.mysql.com:/users/tulin/mysql-5.0-ndb


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/sql_analyse.cc:
  Auto merged

into build.mysql.com:/users/tulin/mysql-5.0

  Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets


sql/mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
sql/set_var.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
mysql-test/t/innodb.test:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
mysql-test/r/innodb.result:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/mysqld.cc:
  Auto merged

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0