mysql-test/r/join_outer.result:
  Update test results
mysql-test/r/null.result:
  Update test results

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/slave.cc:
  keep local copy

BUILD/FINISH.sh:
  Remove all config.cache files
BUILD/compile-alpha-debug:
  Update
BUILD/compile-ia64-debug-max:
  Update
Docs/manual.texi:
  Added auto_increment example
sql/sql_select.cc:
  Fix bugs in LEFT JOIN and field=NULL
sql/sql_yacc.yy:
  Remove compiler warnings

Sigh, should be all the remaining errors!

Added missing InnoDB variables to SHOW VARIABLES.
Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
Fixed bug when doing 'LEFT JOIN ...  ON (column_name = constant) WHERE column_name = constant'


Docs/manual.texi:
  Changelog
libmysql/libmysql.c:
  Don't use signal() on windows.
mysql-test/r/join_outer.result:
  Test for bugfix
mysql-test/r/null.result:
  Test for bugfix
mysql-test/t/join_outer.test:
  Test for bugfix
mysql-test/t/null.test:
  Test for bugfix
sql/mysqld.cc:
  Add missing InnoDB variables to SHOW VARIABLES.
sql/sql_select.cc:
  Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
  Fixed bug when doing 'LEFT JOIN ...  ON (column_name = constant) WHERE column_name = constant'

into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0

into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged

Updated reserved word list.


Docs/manual.texi:
  updated reserved word list

BitKeeper/etc/ignore:
  Added Docs/tex.fmt to the ignore list

When should add a function with STDCALL defined should be
add to this file, in this way the functions is exported for
the client application on Win32.

into light.local:/home/miguel/develop/mysql-4.0.0

Updated reserved words list.

Added Jorge to developers.
Added activities for Miguel.

into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/Support/docbook-fixup.pl:
  Changed Appendix killing list.
Docs/manual.texi:
  Misplaced ChangeLog entry. (Thanks nickg!)

bug on reconnect


sql/slave.cc:
  fixed sleep bug

BitKeeper/etc/ignore:
  auto-union
Docs/manual.texi:
  Auto merged

Safer, a bit faster filesort.
Code changes to avoid calls to current_thd() (faster code).
Removed all compiler warnings from readline.


BitKeeper/etc/ignore:
  Add my_global.h back.
Docs/manual.texi:
  4.0.1 Changelog
include/my_sys.h:
  Added strmake_root
libmysql/libmysql.c:
  Don't do signal() on windows (Causes instability problems)
mysys/my_alloc.c:
  Added strmake_root
readline/bind.c:
  Remove warnings
readline/complete.c:
  Remove warnings
readline/display.c:
  Remove warnings
readline/funmap.c:
  Remove warnings
readline/histexpand.c:
  Remove warnings
readline/histfile.c:
  Remove warnings
readline/history.h:
  Remove warnings
readline/histsearch.c:
  Remove warnings
readline/isearch.c:
  Remove warnings
readline/kill.c:
  Remove warnings
readline/macro.c:
  Remove warnings
readline/readline.c:
  Remove warnings
readline/readline.h:
  Remove warnings
readline/rltty.c:
  Remove warnings
readline/search.c:
  Remove warnings
readline/shell.c:
  Remove warnings
readline/terminal.c:
  Remove warnings
readline/tilde.c:
  Remove warnings
readline/tilde.h:
  Remove warnings
readline/undo.c:
  Remove warnings
readline/util.c:
  Remove warnings
readline/vi_mode.c:
  Remove warnings
sql-bench/server-cfg.sh:
  Added use of truncate table
sql-bench/test-insert.sh:
  Added use of truncate table
  Changed some tests to use keys instead of 'range'
sql-bench/test-wisconsin.sh:
  Cleanup
sql/field.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/field.h:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/filesort.cc:
  Safer memory allocation;  Don't allocate pointer to buffers directly, but use an IO_CACHE instead.
  This will allow us to use more memory for keys and will also work better if the number of rows that is to be sorted is much larger than expected.
sql/item.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item.h:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item_func.h:
  Cleanup
sql/opt_range.cc:
  Use mem_root instead of sql_alloc() to get more speed
sql/sql_class.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_class.h:
  Added strmake()
sql/sql_handler.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_lex.cc:
  Use mem_root instead of sql_alloc() to get more speed
sql/sql_select.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
tests/fork2_test.pl:
  Fixed typos
tests/fork_big.pl:
  Fixed typos
tests/insert_and_repair.pl:
  Fixed typos
tests/rename_test.pl:
  Fixed typos
tests/test_delayed_insert.pl:
  Fixed typos

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

mysql-test/r/fulltext.result:
  new test
mysql-test/t/fulltext.test:
  new test

  * Fix kernelnotes.de mirror FTP url
  * Add a mirror in Germany


Docs/manual.texi:
  * Fix kernelnotes.de mirror FTP url
  * Add a mirror in Germany

Docs/manual.texi:
  SCCS merged

Added Erik's texts on logos/trademarks, licences, business services. Fixup location/refs/dups later.
Added Kaj's text MySQL 4.0 in a Nutshell. Fixup location/refs later.

Shuffled transit Perl Installation Comments to 2.7
Shuffled transit Functions for Use with GROUP BY Clauses to 6.3.6

BitKeeper/etc/ignore:
  Added Docs/texi2dvi.out to the ignore list