into mysql.com:/home/kostja/mysql/mysql-4.0-1790

into mysql.com:/bk/mysql-4.0

VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl:
  This should not be the product version; it must match Default.shl
VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl:
  This should not be the product version; it must match Default.shl
VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl:
  This should not be the product version; it must match Default.shl

into mysql.com:/my/mysql-4.0

move bdb/innodb tests to right places


mysql-test/r/bdb.result:
  Update results after test changes
mysql-test/r/innodb.result:
  Update results after test changes
mysql-test/r/multi_update.result:
  Update results after test changes
mysql-test/t/bdb.test:
  Move bdb tests here
mysql-test/t/innodb.test:
  Move innodb test here
mysql-test/t/multi_update.test:
  move bdb/innodb tests to repective test
sql/mysqld.cc:
  Allow space in service names

into mysql.com:/home/dlenev/src/mysql-4.0-tsbug

if we failed to classify integer as datetime 
in Field_datetime::store().
Stylistic clean-ups.


sql/field.cc:
  Fix undeterministic behaviour of year check 
  if we failed to classify integer as datetime
  Stylistic clean-ups.

into mysql.com:/home/mysql_src/mysql-4.0

The problem was that when the slave SQL thread reads a hot relay log (hot = the one being written to by the
slave I/O thread), it must have the LOCK_log. It already took it for read_log_event(), but needs
it also for check_binlog_magic().
This should fix all recently reported failures of the rpl_max_relay_size test in 4.1 and 5.0
(though the bug exists since 4.0, it showed up first in 5.0).


sql/slave.cc:
  Fix for BUG#2011 "rare race condition producing "binlog has bad magic number" error in slave".
  The problem was that when the slave SQL thread reads a hot relay log (hot = the one being written to by the
  slave I/O thread), it must have the LOCK_log. It already took it for read_log_event(), but needs
  it also for check_binlog_magic().

into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.bugfssl

into mysql.com:/home/psergey/mysql-4.0

   "$1: unbound variable" error when no option was given


support-files/MacOSX/MySQL:
   - Suppress the annoying "$1: unbound variable" error when no option
     was given

into mysql.com:/home/mysql_src/mysql-4.0

into mysql.com:/home/psergey/mysql-4.0

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/home/dlenev/src/mysql-4.0-tsbg

about it". Now numbers representing illegal timestamps are 
converted to 0 value if they are stored as timestamp or 
datetime. This behaviour is consistent with manual and with 
behaviour of string -> timestamp conversion.


mysql-test/r/type_datetime.result:
  Added test if ranges are checked during 
  integer, string -> timestamp conversion
mysql-test/r/type_timestamp.result:
  Added test if ranges are checked during 
  integer, string -> datetime conversion
mysql-test/t/type_datetime.test:
  Added test if ranges are checked during 
  integer, string -> datetime conversion
mysql-test/t/type_timestamp.test:
  Added test if ranges are checked during 
  integer, string -> timestamp conversion
sql/field.cc:
  Checks of month, day, hour, minute and second ranges were added
  to storing of integer into Field_datetime and Field_timestamp
  and so for integer -> datetime, timestamp conversion.

 SQL_BIG_RESULT used':
- BIT_AND now returns BIGINT UNSIGNED
- in case there were no matching rows BIT_AND returns 18446744073709551615 
(but not NULL), BIT_OR returns 0 (but not NULL). That's how Monty wants it
and how is described in our docs.




include/my_global.h:
  Added definition for ULONGLONG_MAX.
  This is also a check that ULL type specifier
  can be used on all supported platforms.
mysql-test/r/func_group.result:
  bug #1790, post-review work: test results fixed
sql/item_sum.cc:
  small cleanup
sql/item_sum.h:
  few style fixes.
  BIT_AND and BIT_OR now are both BIGINT UNSIGNED

instead of Log_event::Log_event(THD*, ...) when the event is built in the master
to be written in the binlog.
Rand_log_event already used the good constructor, so there really is no reason
for Intvar_log_event to be an exception.
This fixes a test failure of last night (which appeared after I removed a useless
e.server_id=thd->server_id in log.cc; in fact this line was not useless because
it hid the bad constructor).
Replication tests pass, with Valgrind too.


sql/log_event.h:
  There is no reason that Intvar_log_event's constructor calls Log_event::Log_event()
  instead of Log_event::Log_event(THD*, ...) when the event is built in the master
  to be written in the binlog.
  Rand_log_event already used the good constructor, so there really is no reason
  for Intvar_log_event to be an exception.
  This fixes a test failure of last night (which appeared after I removed a useless
  e.server_id=thd->server_id in log.cc; in fact this line was not useless because
  it hid the bad constructor).

into mysql.com:/home/kostja/mysql/mysql-4.0-1790

into mysql.com:/home/mysql_src/mysql-4.0

which does e.server_id=thd.server_id.


sql/log.cc:
  unneeded: the Intvar_log_event constructor calls the Log_event constructor
  which does e.server_id=thd.server_id.

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

It happens that mysql->client_next->client_next=mysql
and mysql_close() goes into infinite loop.
Results vary from simple sigsegv (FreeBSD), to hard system lockup (Linux)
:)

into mysql.com:/my/mysql-4.0

mysql-test/r/range.result:
  test for range optimzier bug
mysql-test/t/range.test:
  test for range optimzier bug

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

into mysql.com:/home/kostja/mysql/mysql-4.0-root

options.rpl_probe} as they are zero-initialized in spawn_init()

no need to set rpl_parse, rpl_probe and rpl_pivot to zero as whole mysql
structure is bzeroed in mysql_init(0) few lines before

into mysql.com:/my/mysql-4.0

This makes it possible to check origin of binary from the output of 'show variables'


include/mysql_version.h.in:
  Added MYSQL_COMPILATION_COMMENT
sql/mysqld.cc:
  Added compilation comment to mysqld --version
sql/set_var.cc:
  Added compilation comment to 'show variables'

Docs/Makefile.am:
   - Removed COPYING.LIB from txt_files target

   after it was removed from manual.texi (where it was automatically
   generated from).


Docs/Makefile.am:
   - don't create COPYING.LIB anymore (was removed from manual.texi)
Makefile.am:
   - Removed COPYING.LIB from the source distribution
scripts/make_binary_distribution.sh:
   - Removed COPYING.LIB from the binary distribution
scripts/make_win_src_distribution.sh:
   - Removed COPYING.LIB from the windows source distribution
support-files/mysql.spec.sh:
   - Removed COPYING.LIB from the Server RPM

   confuses RPM's Perl module dependency checking (it adds a bogus
   requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)


scripts/mysqlaccess.sh:
   - Rephrased option help text so it does not start with "use" as this 
     confuses RPM's Perl module dependency checking (it adds a bogus
     requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)
sql-bench/bench-init.pl.sh:
   - Rephrased option help text so it does not start with "use" as this 
     confuses RPM's Perl module dependency checking (it adds a bogus
     requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)