Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

Check if AND/OR expression can be NULL; Fixed bug in GROUP BY and-or-expression where expression could be NULL
Bug fix for SHOW OPEN TABLES when user didn't have privilege to access all open tables.
Better fix for ALTER TABLE on BDB tables.


Docs/manual.texi:
  Changelog
client/mysql.cc:
  Simple optimization
libmysql/libmysql.c:
  Removed initialization of varibles that are already set to zero
myisam/myisamchk.c:
  Fixed comment for extend-check
mysql-test/r/bdb-alter-table-1.result:
  Updated results
mysql-test/r/bdb-alter-table-2.result:
  Updated results
mysql-test/r/distinct.result:
  Updated results after bug fix
mysql-test/r/handler.result:
  Updated results
mysql-test/r/innodb_handler.result:
  Updated results
mysql-test/r/select.result:
  Updated results
mysql-test/r/varbinary.result:
  Updated results
mysql-test/t/bdb-alter-table-1.test:
  Added comments
mysql-test/t/bdb-alter-table-2.test:
  Added comments
mysql-test/t/select.test:
  Remove OPTION in SET OPTION
  Added tests for ORDER BY key LIMIT
sql/item_cmpfunc.cc:
  Check if AND/OR expression can be NULL
sql/mysqld.cc:
  mysqld --help now shows value of datadir
sql/share/english/errmsg.txt:
  Better error message for syntax error
sql/sql_base.cc:
  Bug fix for SHOW OPEN TABLES
sql/sql_class.cc:
  Moved virtual function to .cc file to avoid that we have to include assert.h everywhere.
sql/sql_class.h:
  Moved virtual function to .cc file to avoid that we have to include assert.h everywhere.
sql/sql_parse.cc:
  Removed old dead code from 3.23
sql/sql_select.cc:
  Improved optimization of ORDER BY key LIMIT
sql/sql_table.cc:
  More comments,
  Better fix for ALTER TABLE on BDB tables.

Docs/manual.texi:
   - Added gcc 3.1 on HP-UX compile options

Docs/manual.texi:
  clarify 4.0.2 ORDER BY change note.

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  A little rearrangement of binlog description.

test for REPAIR ... USE_FRM added


sql/sql_table.cc:
  protected close_cached_table() call in REPAIR ... USE_FRM with a mutex

Docs/manual.texi:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/r/myisam.result:
  merged with 'ul'

BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
Docs/manual.texi:
  Auto merged
innobase/configure.in:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/pars/pars0grm.c:
  Auto merged
innobase/pars/pars0grm.y:
  Auto merged
innobase/pars/pars0lex.l:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged

myisam/mi_delete_all.c:
  reverting the wrong bugfix
mysql-test/r/delete.result:
  moving the test case to where it belongs
mysql-test/t/delete.test:
  moving the test case to where it belongs

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

Docs/manual.texi:
  SCCS merged

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

sql/mysqld.cc:
  Some spelling checking error corrections a la Paul Dubois

mysql-test/r/binary.result:
  fixed test to be independed from environment
mysql-test/r/delayed.result:
  fixed test to be independed from environment
mysql-test/r/fulltext_left_join.result:
  fixed test to be independed from environment
mysql-test/r/func_group.result:
  fixed test to be independed from environment
mysql-test/r/func_in.result:
  fixed test to be independed from environment
mysql-test/r/key_primary.result:
  fixed test to be independed from environment
mysql-test/r/lock_multi.result:
  fixed test to be independed from environment
mysql-test/r/odbc.result:
  fixed test to be independed from environment
mysql-test/r/type_set.result:
  fixed test to be independed from environment
mysql-test/r/type_time.result:
  fixed test to be independed from environment
mysql-test/r/type_timestamp.result:
  fixed test to be independed from environment
mysql-test/r/type_year.result:
  fixed test to be independed from environment
mysql-test/r/varbinary.result:
  fixed test to be independed from environment
mysql-test/r/warnings.result:
  fixed test to be independed from environment
mysql-test/t/binary.test:
  fixed test to be independed from environment
mysql-test/t/delayed.test:
  fixed test to be independed from environment
mysql-test/t/flush_table.test:
  fixed test to be independed from environment
mysql-test/t/fulltext_left_join.test:
  fixed test to be independed from environment
mysql-test/t/func_group.test:
  fixed test to be independed from environment
mysql-test/t/func_in.test:
  fixed test to be independed from environment
mysql-test/t/key_primary.test:
  fixed test to be independed from environment
mysql-test/t/lock_multi.test:
  fixed test to be independed from environment
mysql-test/t/odbc.test:
  fixed test to be independed from environment
mysql-test/t/type_set.test:
  fixed test to be independed from environment
mysql-test/t/type_time.test:
  fixed test to be independed from environment
mysql-test/t/type_timestamp.test:
  fixed test to be independed from environment
mysql-test/t/type_year.test:
  fixed test to be independed from environment
mysql-test/t/varbinary.test:
  fixed test to be independed from environment
mysql-test/t/warnings.test:
  fixed test to be independed from environment

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

Docs/manual.texi:
  minor symlink section cleanups

into teton.kitebird.com:/home/paul/mysql-4.0

manual.texi	minor fixups


Docs/manual.texi:
  define "replication coordinates"

Equivalent to:
save_master_pos; connection slave; sync_with_master;


client/mysqltest.c:
  Added sync_slave_with_master to mysqltest
  Accepts 1 optional argument: the slave connection name
  Default connection name is 'slave'.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Build-tools/Do-compile:
   - applied some modifications made in the 4.0 tree
   - added option --make-options to pass options to "make" after configure
   - added option --raid to enable RAID
   - added option --libwrap to enable TCP wrapper support
   - make sure to remove log files as early as possible
   - fixed option --with-other-libc to actually work
   - fixed some oddly-placed quotes in the configure call

Build-tools/Do-compile:
   - actually add the with-other-libc option to the config options when set
   - fixed some odd-placed quotation marks in the configure line

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


client/mysqlcheck.c:
  Auto merged

into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/set_var.cc:
  Auto merged

sql/set_var.cc:
  some small fixes.....

into teton.kitebird.com:/home/paul/mysql-4.0

Docs/manual.texi:
  minor fix

Docs/manual.texi:
  Some BDB fixups.

sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  minor fix to 3.23.53 change note
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

configure.in:
   - Bump up version number to 4.0.4-beta, now that 4.0.3 is released

include/config-win.h:
  Portability fix for windows
include/my_global.h:
  General portability fix
sql/mysqld.cc:
  Portability fix for windows
sql/set_var.cc:
  Portability fix for windows
sql/sql_yacc.yy:
  Portability fix for windows

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged