Docs/manual.texi:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
configure.in:
  no merge - used local
mysql-test/r/fulltext.result:
  no merge - used local
mysql-test/r/myisam.result:
  no merge - used local
sql/item_func.cc:
  no merge - used local
sql/sql_delete.cc:
  no merge - used local
sql/sql_parse.cc:
  no merge - used local
sql/sql_select.cc:
  no merge - used local

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

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

Docs/mirrors.texi:
  Fixup for mirrors file.

  Change list format


Docs/mirrors.texi:
  Change list format

into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0

  new file

--manager implies --skip-gdb-magic
(which was introduced to make --gdb usable w/o manager)

mysql-test/r/fulltext_distinct.result:
  boolean test added
mysql-test/t/fulltext_distinct.test:
  boolean test added
mysql-test/r/fulltext_left_join.result:
  boolean test added
mysql-test/t/fulltext_left_join.test:
  boolean test added

Updated reserved words list in manual.


Docs/Support/update-reserved-words.pl:
  Fix to reserved words script, 2 keywords and 15 synonyms were missing.
Docs/manual.texi:
  Updated reserved word list.

mysql-test/fix-result:
  updated version
mysql-test/r/rpl_log.result:
  fixed result to be portable

  Remove "for windows"
  Updated contributed software link


Docs/manual.texi:
  Remove "for windows"

  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

into co3064164-a.bitbike.com:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged

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

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

--local-master option in mysql-test-run
do not log CREATE TABLE when doing table dump
fix replication to slave off 3.23 master


client/mysqltest.c:
  fix to be able to use env vars for socket and port in connect
mysql-test/include/master-slave.inc:
  connect to port specified in environment
mysql-test/mysql-test-run.sh:
  added --local-master option - will assume master is on port 3306 on localhost
sql/log_event.cc:
  fixes to slave off 3.23 master
sql/log_event.h:
  fixes to slave off 3.23 master
sql/slave.cc:
  do not log CREATE TABLE when doing table dump

  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

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


Docs/manual.texi:
  Auto merged

into co3064164-a.bitbike.com:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged

  Remove links to /company/people/index.html


Docs/manual.texi:
  Remove links to /company/people/index.html

  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