Using it comes merged from 4.1.


config/ac-macros/misc.m4:
  Implement the new '--with-big-tables' flag to "configure".

fails there; until we find reason (me and possibly Konstantin).


mysql-test/t/rpl_timezone.test:
  disabling test if --ps-protocol, until we find reason
sql/slave.cc:
  fixing comment

server-tools/instance-manager/instance.cc:
  Revert the inclusion of 'signal.h' as this module contains 'kill()'.

into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod

into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod


BitKeeper/etc/logging_ok:
  auto-union
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged

of SET ONE_SHOT; storing tz info directly in event (if this info is needed),
it's now allowed to have different global tz on master and slave.


client/mysqlbinlog.cc:
  we need MAX_TIME_ZONE_NAME_LENGTH when processing log_event.h, and it's declared in mysql_priv.h
mysql-test/r/rpl_timezone.result:
  result update
mysql-test/t/rpl_timezone-slave.opt:
  Now that we can have different global value of timezone on master and slave, let's test it.
mysql-test/t/rpl_timezone.test:
  Tests of the new replication of timezones: checking the output of mysqlbinlog,
  replication of CONVERT_TZ().
sql/ha_innodb.cc:
  No very fast shutdown on Netware (anyway it's disabled on all platforms,
  but this is so that we don't forget to keep it disabled on Netware in the future).
sql/log.cc:
  No more need to write SET ONE_SHOT to binlog for character set and timezone
  (as we store this info  directly nin the Query_log_event now).
sql/log_event.cc:
  Exclude ::write() methods if MYSQL_CLIENT.
  Storing timezone info in the Query_log_event in master. Re-reading it in slave.
  Small code cleanups. I plan to not store the end 0 of catalog in binlog
  events soon.
sql/log_event.h:
  replication of time zones: a place for tz info in Query_log_event,
  in LAST_EVENT_INFO. Plus if we are compiling a client, we don't need
  the ::write() methods, so keeping them out (of mysqlbinlog.cc;
  keeping them in, resulted in problem that mysqlbinlog does not know Timezone
  structure).
sql/mysql_priv.h:
  moving this define from tztime.h (tztime.h has things which are
  too much for a client like mysqlbinlog).
sql/set_var.cc:
  It's now allowed to change global value of charset or timezone even if using binlogging
  or if being a slave.
  Making CONVERT_TZ(,,@@session.time_zone) replicate.
sql/set_var.h:
  these ::check()s are not needed anymore (changing global charset
  or timezone is now allowed even if binlogging or slave)
sql/slave.cc:
  No more need to check for same global timezone if master is 5.x
  (ok, strictly speaking if it is > 5.0.3 but this is alpha).
sql/slave.h:
  a function to wrap settings of charset to default.
sql/tztime.cc:
  Adaptation of my_tz_find() to the case where it's not called from inside
  a query (i.e. cannot join its tz tables to the query's ones): this variant
  opens the tz tables itself, reads from them, and closes them. This is presently
  only used by the slave SQL thread (when it sets the tz before executing a query).
sql/tztime.h:
  declaration of new function, plus moving symbol to mysql_priv.h
  for easier usage in mysqlbinlog (Dmitri, pardon me).
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/home/cps/mysql/devel/merge-5.0

included before any other include) was hidden from me.


server-tools/instance-manager/commands.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/commands.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/factory.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/guardian.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/guardian.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance_map.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance_map.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/instance_options.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/log.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/manager.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/messages.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/messages.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/mysql_connection.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/mysqlmanager.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/options.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/parse.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/parse_output.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/protocol.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/protocol.h:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/thread_registry.cc:
  Fix for AIX compilation failure & cleanup
server-tools/instance-manager/user_map.h:
  Fix for AIX compilation failure & cleanup

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


sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

Fixed newly introduced bug in rollup


client/mysqldump.c:
  Safer buffer allocation
  Removed wrong assert
mysql-test/r/olap.result:
  more tests
mysql-test/t/olap.test:
  more tests
sql/handler.cc:
  Simple cleanup
  Fixed wrong check for next digit (wrong debug output)
sql/item.cc:
  Replace shrink_to_length() with mark_as_const() as the former allowed one to do changes to the string
sql/item_sum.cc:
  Change reference to pointer
  Trivial optimzation of testing 'allways_null'
sql/mysqld.cc:
  Proper indentation of comment
sql/sql_select.cc:
  Fixed newly introduced bug in rollup
sql/sql_string.h:
  Remove not needed 'shrink_to_length()'
  Added 'mark_as_const()' to be used when one want to ensure that a string is not changed

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


BitKeeper/etc/logging_ok:
  auto-union
include/config-netware.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged

  If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)


innobase/trx/trx0trx.c:
  If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)

BitKeeper/etc/logging_ok:
  auto-union
innobase/include/trx0trx.h:
  Auto merged
innobase/trx/trx0trx.c:
  SCCS merged

  If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)


innobase/include/trx0trx.h:
  If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
innobase/trx/trx0trx.c:
  If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)

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


configure.in:
  Auto merged

  5.0.3 is a beta


configure.in:
  5.0.3 is a beta

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

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

sql/item_sum.cc:
  Auto merged

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

  Added 'proc' and 'procs_priv' tables, updated others


mysql-test/lib/init_db.sql:
  Added 'proc' and 'procs_priv' tables, updated others

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


mysql-test/mysql-test-run.pl:
  Auto merged

(Change done by Ramil and sent via IRC)

  Made --timer work
mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log


mysql-test/mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log
mysql-test/lib/mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test/lib/mtr_report.pl:
  Made --timer work

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

sql/my_decimal.h:
  Refixing the valgrind warning in decimal.c:sanity() in a different way
  (as requested by Monty): we want to let valgrind see uninitialized
  memory whenever it's possible.
strings/decimal.c:
  Fix sanity() to not look into possibly uninitialized memory if
  HAVE_purify.

innobase/include/data0type.ic:
  Auto merged
mysql-test/r/endspace.result:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
support-files/mysql.spec.sh:
  Manual merge.

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

mysql-test/r/federated.result:
  made sure result has SLAVE_PORT!
mysql-test/t/federated.test:
  added --replace_result to a table creation that I forgot to add before

"Warnings on 'drop procedure' platform-specific").

In mysqltest we should not issue "SHOW WARNINGS" until we have not 
read results from all statements in multi-statement.

Otherwise such "SHOW WARNINGS" will either cause "Packets out of order"
error and thus will ruin current connection (but we may not notice this as
it happened in sp.test because we ignore errors from such auxilary
SHOW WARNINGS and use auto-reconnecting connections) or will
succeed but consume first packet from next statement in multi-statement
sequence (this happens if "SHOW WARNINGS" is issued when this packet
is already received by client. Packet is thrown away by net_clear()
call which is issued when "SHOW WARNINGS" is sent to server).

In our case sp.test failed because usually we had first situation
but sometimes second situation occured causing warning to pop-up.


client/mysqltest.c:
  We should not issue "SHOW WARNINGS" if we have not processed all 
  results from multi-statement.

  Added a test case for bug #9210.
sql_select.cc:
  Fixed bug #9210.
  The function calc_group_buffer did not cover the case
  when the GROUP BY expression was decimal.
  Slightly optimized the other code.


sql/sql_select.cc:
  Fixed bug #9210.
  The function calc_group_buffer did not cover the case
  when the GROUP by expression was decimal.
  Slightly optimized the other code.
mysql-test/t/func_group.test:
  Added a test case for bug #9210.

sql/my_decimal.h:
  HAVE_purify is defined in valgrind-max build as well: one possible 
  solution is to disable the sanity check in decimal.c in the valgrind-max
  build, but it's better to have more checks than less, for
  valgrind-max builds are not always used in conjunction with valgrind.

tests/mysql_client_test.c:
  Cleanup, remove some -ansi -pedancit warnings.

innobase/include/data0type.ic:
  Fix for sorting of innodb TEXT columns.

been killed.


mysql-test/r/kill.result:
  Update results
mysql-test/t/kill.test:
  Fix 'ping' to be '--ping' and make test that this is a new
  connection actually test that.

sql/item_sum.cc:
  Remove C_MODE_START/END around function, add cast