fixed skip counter to do the RightThing (TM) when the user messes up.
Still do RightThing when he gets it right.


mysql-test/r/rpl000016.result:
  updated test result
mysql-test/t/rpl000013.test:
  test alias bug
mysql-test/t/rpl000016.test:
  test for proper skip when the user messes up
sql/slave.cc:
  proper skip even when the user goofs up
sql/sql_base.cc:
  drop real name, not last used alias in the log

Fixed race condition when using the binary log and INSERT DELAYED which could cause the binary log to have rows that was not yet written to MyISAM tables.


Docs/manual.texi:
  Changelog
mysql-test/r/null_key.result:
  Fix of testcase after changing optimizer to only use range keys if it would use a long part of the SAME key.
sql/sql_insert.cc:
  Fixed race condition with binary log and INSERT DELAYED
sql/sql_select.cc:
  Fixed bug when joining with caching

Fixed bug where one got an empty set instead of a DEADLOCK error when using BDB tables.


Docs/manual.texi:
  Cleanup
configure.in:
  Version number change
mysql-test/t/backup.test:
  drop used tables
mysql-test/t/bdb-crash.test:
  cleanup
mysys/thr_lock.c:
  cleanup
sql/mysqld.cc:
  safety fix
sql/records.cc:
  Fixed bug where one got an empty set instead of a DEADLOCK error when using
  BDB tables.
sql/sql_table.cc:
  Fix race  condition in ANALYZE TABLE.

into mysql.sashanet.com:/home/sasha/src/bk/mysql

on a signal

mysys/my_seek.c:
  Remove warning

Docs/manual.texi:
  Changelog

sql/mysqld.cc:
  Auto merged

signal. Tested to the extent that it does not break Linux. Could not test on
Darwin because the machine was not reachable. Will push anyway - at least it
does not make things worse. Testing on Darwin is needed, however.


sql/mysqld.cc:
  backport of shutdown fix for platforms that cannot break a syscall with a signal

it uses now thd->lex.ftfunc_list
moved ft-initialization to a separate function
re-disabled implicit ft initialization


sql/item_func.cc:
  re-disabled implicit initialization that was re-enabled (by me)
  for reasons unknown (at least the code passed all the tests)
sql/mysql_priv.h:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function
sql/sql_base.cc:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function
sql/sql_parse.cc:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function
sql/sql_select.cc:
  removed ftfuncs argument for mysql_select
  it uses now thd->lex.ftfunc_list
  moved ft-initialization to a separate function

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

Docs/manual.texi:
  ChangeLog
sql/mysqld.cc:
  Cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Fix a seg fault if a lock wait timeout is exceeded at the some time someone grants the lock


innobase/srv/srv0srv.c:
  Fix a seg fault if a lock wait timeout is exceeded at the some time someone grants the lock

was up to date.


Docs/manual.texi:
  ChangeLog
configure.in:
  Version number change
mysql-test/r/myisam.result:
  Test of optimize table
mysql-test/t/myisam.test:
  Test of optimize table

  Fix wrong (though equivalent) type decl


innobase/dict/dict0dict.c:
  Fix wrong (though equivalent) type decl
innobase/include/dict0dict.h:
  Fix wrong (though equivalent) type decl

  Fix a bug in insert buffer B-tree upper levels; probably caused the crash by B.Fitzpatrick
buf0flu.c:
  Fix a bug in previous change
  A small optimization for LRU flushes to avoid losing hot pages from the buffer pool


innobase/buf/buf0flu.c:
  Fix a bug in previous change
innobase/dict/dict0dict.c:
  Fix a bug in insert buffer B-tree upper levels; probably caused the crash by B.Fitzpatrick
innobase/include/dict0dict.h:
  Fix a bug in insert buffer B-tree upper levels; probably caused the crash by B.Fitzpatrick
innobase/btr/btr0btr.c:
  Fix a bug in insert buffer B-tree upper levels; probably caused the crash by B.Fitzpatrick
innobase/btr/btr0cur.c:
  Fix a bug in insert buffer B-tree upper levels; probably caused the crash by B.Fitzpatrick

  Fix a bug which could cause InnoDB to complain it cannot find free blocks from the buffer cache during recovery


innobase/buf/buf0flu.c:
  Fix a bug which could cause InnoDB to complain it cannot find free blocks from the buffer cache during recovery

Docs/manual.texi:
  Changelog
mysql-test/mysql-test-run.sh:
  Change shutdown to 20 seconds for slow systems
mysql-test/r/innodb.result:
  Testcase for found bug
mysql-test/t/innodb.test:
  Testcase for found bug

  Fix a typo


sql/ha_innobase.cc:
  Fix a typo

  Make database and table names always lower case on Windows


sql/ha_innobase.cc:
  Make database and table names always lower case on Windows

Applied patch to mysqlhotcopy


myisam/mi_open.c:
  Fixed some purify warnings
mysql-test/mysql-test-run.sh:
  Added --core as default to test suite
scripts/make_binary_distribution.sh:
  Added missing mysqlbinlog
scripts/mysqlhotcopy.sh:
  Applied patch with --record-log option
sql/item_timefunc.cc:
  Fixed problem with SEC_TO_TIME() for long signed integers.

Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column is declared as NOT NULL.


BUILD/SETUP.sh:
  Use -O1 to avoid problem with INLINE functions
Docs/manual.texi:
  Changelog
mysql-test/r/join.result:
  Test for bugfix
mysql-test/t/join.test:
  Test for bugfix
sql/sql_select.cc:
  Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column was declared as NOT NULL.
BitKeeper/etc/ignore:
  Added bdb/include/db_ext.h bdb/include/mutex_ext.h to the ignore list

Fixed bug with BLOB keys in BDB tables
Fixed problem with MERGE tables on OS with 32 bit files
Fixed that TIME_TO_SEC() works with negative times


Docs/manual.texi:
  Changelog
client/mysqladmin.c:
  Fix that mysqladmin shutdown can be interrupted with ^C
include/mysqld_error.h:
  Fixed typo
mysql-test/r/func_time.result:
  Added test case for negative times
mysql-test/t/func_time.test:
  Added test case for negative times
mysql-test/t/rpl000015-slave.sh:
  Removed warnings
mysql-test/t/rpl000016-slave.sh:
  Removed warnings
sql/field.cc:
  Fixed bug with BLOB keys in BDB tables
sql/field.h:
  Fixed bug with BLOB keys in BDB tables
sql/ha_berkeley.cc:
  Fixed bug with BLOB keys in BDB tables
sql/ha_myisammrg.cc:
  Fixed problem with MERGE tables on OS with 32 bit files
sql/item_timefunc.cc:
  Fixed that TIME_TO_SEC() works with negative times.
sql/share/swedish/errmsg.txt:
  Merge with 4.0
sql/sql_acl.cc:
  Fixed typo

BitKeeper/deleted/.del-configure.in~c6fc04d4e3d6e291:
  Delete: libmysql/configure.in
BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
  Delete: bdb/include/db_ext.h
BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
  Delete: bdb/include/mutex_ext.h
Build-tools/Do-all-build-steps:
  Portability fix (-j 2 doesn't always work)
configure.in:
  Added extra compiler options for libmysqld (required for HPUX)
libmysql/Makefile.am:
  Added extra compiler options for libmysqld (required for HPUX)
libmysql_r/Makefile.am:
  Added extra compiler options for libmysqld (required for HPUX)
sql/log_event.cc:
  Removed warning

Fixed Rows_examined in slow query log.


Docs/manual.texi:
  Changlog
sql/log.cc:
  Changed time -> query_time in slow query log.
sql/sql_select.cc:
  Fixed Rows_examined count in slow query log.

Fix for consistent 0000-00-00 date handling
Close + open binary logs on flush tables
Fix for AVG() in HAVING.


BUILD/SETUP.sh:
  Compile MySQL with -O0 to make debugging easier.
Docs/manual.texi:
  Changelog
configure.in:
  Version change
innobase/buf/buf0lru.c:
  Fix for windows
mysql-test/r/func_time.result:
  Updated tests
mysql-test/r/having.result:
  Updated tests
mysql-test/t/func_time.test:
  Updated tests
mysql-test/t/having.test:
  Updated tests
mysys/mf_casecnv.c:
  Portability fix
mysys/mf_qsort.c:
  Portability fix
mysys/my_compress.c:
  Portability fix
mysys/my_tempnam.c:
  More comments
sql/field.cc:
  Fix for consistent 0000-00-00 date handling
sql/item.h:
  Fix for AVG() in HAVING
sql/log.cc:
  Close + open update logs on flush tables
sql/sql_select.cc:
  More debugging info
sql/time.cc:
  Fix for consistent 0000-00-00 date handling
strings/ctype.c:
  Portability fix
strings/strto.c:
  Portability fix

innobase/row/row0mysql.c:
  Fix an assertion when an empty database is dropped

Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts
Fixed error messages.
Fixed problem with const propagation when comparing columns of different types


BitKeeper/deleted/.del-.cvsignore~a91d63182f0b2366:
  Delete: sql/share/norwegian/.cvsignore
BitKeeper/deleted/.del-.cvsignore~469064b5190d703d:
  Delete: sql/share/norwegian-ny/.cvsignore
Docs/manual.texi:
  Changelog
client/client_priv.h:
  Update for OS2
client/mysqldump.c:
  Update for OS2
include/mysqld_error.h:
  Updated error texts
isam/create.c:
  Removed warning
myisam/myisamchk.c:
  Fix for OS2
myisam/myisampack.c:
  Fix for OS2
mysys/mf_cache.c:
  Fix for OS2
mysys/mf_tempfile.c:
  Fix for OS2
mysys/my_os2file64.c:
  Fix for OS2
mysys/my_tempnam.c:
  Fix for OS2
os2/ChangeLog.os2:
  Fix for OS2
os2/MySQL-Client.icc:
  Fix for OS2
os2/MySQL-Opt.icc:
  Fix for OS2
os2/MySQL-Source.icc:
  Fix for OS2
os2/MySQL-Sql.icc:
  Fix for OS2
os2/MySQL-Util.icc:
  Fix for OS2
sql/mysqld.cc:
  Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts. This avoids some problems when users spefices wrong arguments to mysqld.
sql/nt_servc.cc:
  C
sql/share/czech/errmsg.txt:
  Updated error texts
sql/share/danish/errmsg.txt:
  Updated error texts
sql/share/dutch/errmsg.txt:
  Updated error texts
sql/share/english/errmsg.txt:
  Updated error texts
sql/share/estonian/errmsg.txt:
  Updated error texts
sql/share/french/errmsg.txt:
  Updated error texts
sql/share/german/errmsg.txt:
  Updated error texts
sql/share/greek/errmsg.txt:
  Updated error texts
sql/share/hungarian/errmsg.txt:
  Updated error texts
sql/share/italian/errmsg.txt:
  Updated error texts
sql/share/japanese/errmsg.txt:
  Updated error texts
sql/share/korean/errmsg.txt:
  Updated error texts
sql/share/norwegian-ny/errmsg.txt:
  Updated error texts
sql/share/norwegian/errmsg.txt:
  Updated error texts
sql/share/polish/errmsg.txt:
  Updated error texts
sql/share/portuguese/errmsg.txt:
  Updated error texts
sql/share/romanian/errmsg.txt:
  Updated error texts
sql/share/russian/errmsg.txt:
  Updated error texts
sql/share/slovak/errmsg.txt:
  Updated error texts
sql/share/spanish/errmsg.txt:
  Updated error texts
sql/share/swedish/errmsg.txt:
  Updated error texts
sql/share/ukrainian/errmsg.txt:
  Updated error texts
sql/sql_select.cc:
  Fixed problem with const propagation when comparing columns of different types.
  Fixed bug when HEAP table is converted to MyISAM tables in GROUP BY on long strings.