Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Document when --xml was added to mysql/mysqldump.

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


Docs/manual.texi:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
libmysql/libmysql.c:
  Auto merged

Fix bug when using option groups


libmysql/libmysql.c:
  Fix bug when using option groups
myisam/myisamchk.c:
  Portability fix
mysys/my_getopt.c:
  Portability fix

Docs/manual.texi:
  Changelog
acinclude.m4:
  Cleanup --help output
libmysql/libmysql.c:
  Fix for reading option groups in client

BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
strings/Makefile.am:
  Auto merged

Build-tools/Do-compile:
  Fixed typo
Docs/manual.texi:
  Changelog
mysql-test/r/type_date.result:
  Added test of bug in DATE_FORMAT
mysql-test/t/type_date.test:
  Added test of bug in DATE_FORMAT
scripts/mysqlhotcopy.sh:
  Fix for RAID files
sql/table.cc:
  Fixed typo in last patch

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

Docs/manual.texi:
  Updated autoconf information

into mysql.sashanet.com:/reiser-data/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changelog
configure.in:
  Version change
sql/sql_base.cc:
  Correct fix for not freed memory when using corrupted tables
sql/table.cc:
  Correct fix for not freed memory when using corrupted tables

configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

Fix for --enable-local-infile
Portability fix for bison


bdb/dist/s_recover:
  Update for new POSIX spec
configure.in:
  Fix for --enable-local-infile
libmysql/libmysql.c:
  Cleanup
mysql-test/mysql-test-run.sh:
  Update for new POSIX spec
scripts/safe_mysqld.sh:
  Update for new POSIX spec
sql-bench/server-cfg.sh:
  Update for new POSIX spec
sql/sql_yacc.yy:
  Portability fix for bison

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

mysql-test/mysql-test-run.sh:
  Fix for LOAD DATA LOCAL ...
mysql-test/r/select_found.result:
  Added result for a new test of combo of options for FOUND_ROWS and
  BUFFER_RESULT
mysql-test/t/select_found.test:
  Added test for combo of options for BUFFER_RESULT and FOUND_ROWS
sql/sql_select.cc:
  Added fix for combo of options for BUFFER_RESULT and FOUND_ROWS

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


Docs/manual.texi:
  Auto merged

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


Docs/manual.texi:
  Auto merged

Docs/Support/docbook-fixup.pl:
  Altered regex to catch all indexterms - not just role='cp|fn'

of one of our users which replicates from a live server. So I now have a
lot of confidence in it and will push. It passes all tests, so I if I broke
somebody's code in 3.23 merge this is your fault - you should have had a good test
case :-)


sql/slave.cc:
  added DBUG_ASSERT()
sql/slave.h:
  fixed cache initialization problem

overrun sentry in my_vsnprintf() test
will not be pushed yet


BUILD/FINISH.sh:
  load local fix
BUILD/SETUP.sh:
  load local fix
BUILD/compile-pentium-debug-max:
  load local fix
configure.in:
  load local fix
mysys/my_vsnprintf.c:
  added overrun sentry to the test

sql/sql_acl.cc:
  Auto merged
Docs/manual.texi:
  Merge
sql/sql_select.cc:
  Merge

Fix problem with HAVING and MAX() IS NOT NULL


Docs/manual.texi:
  Changelog & NULL usage with ORDER BY
client/mysqldump.c:
  Cleanup disable keys
mysql-test/r/distinct.result:
  Fix results after ORDER BY with NULL fix
mysql-test/r/group_by.result:
  Fix results after ORDER BY with NULL fix
mysql-test/r/having.result:
  Testcase for bug with HAVING
mysql-test/t/distinct.test:
  Test for DISTINCT + ORDER BY DESC bug
mysql-test/t/having.test:
  Test of HAVING and MAX IS NOT NULL
sql/filesort.cc:
  Fix sorting of NULL values (Should always be first)
sql/item.h:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/item_sum.h:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.cc:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.h:
  Fix sorting of NULL values
sql/sql_select.cc:
  Fix sorting of ORDER BY ... DESC on NULL values.

BitKeeper/etc/ignore:
  Added mysys/test_vsnprintf to the ignore list
mysql-test/mysql-test-run.sh:
  post-merge fix
mysys/my_vsnprintf.c:
  fixed newly introduced bug

Let's hope this did not break anything. Will not push this one until Monty
gets back


BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
client/mysql.cc:
  merged from 3.23
configure.in:
  merged from 3.23
mysql-test/mysql-test-run.sh:
  merged from 3.23
sql/mysqld.cc:
  merged from 3.23
support-files/mysql.spec.sh:
  merged from 3.23

into mysql.sashanet.com:/reiser-data/mysql-4.0

fixed replication bug - flush_master_info() needs to be called every time we read an 
    event from master

this is will not be pushed yet


mysys/my_vsnprintf.c:
  make my_vsnprintf() work with oversized strings
  corrected Swedish "skipp" in the comments
sql/log.cc:
  wrong change - to be undone
sql/slave.cc:
  fixed bug - flush_master_info() needs to be called every time we read an 
  event from master

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


Docs/manual.texi:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/fulltext.result:
  test added
mysql-test/t/fulltext.test:
  test added
sql/item_func.cc:
  fulltext+const_table problem fixed once and forever
sql/item_func.h:
  fulltext+const_table problem fixed once and forever
sql/sql_select.cc:
  fulltext+const_table problem fixed once and forever
sql/table.h:
  fulltext+const_table problem fixed once and forever

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

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


Docs/manual.texi:
  Auto merged

libmysql/libmysql.c:
  Fixes a very rare bug when variable name (without '_') and it's 
  value are at the very end of the config file.
  
  I have tested it , but would liek little mobster to test it further
mysql-test/r/union.result:
  results for union test that proves that EXPLAIN UNION bugs are fixed
mysql-test/t/union.test:
  additional tests for EXPLAIN on UNION's that have previously failed
sql/sql_yacc.yy:
  Some small fixes for newer parsers.
  Only unsigned int yystacksize remains to be fixed.
  This I leave to Monty.
  Present fixes are only aesthetic and do not harm.

  Update
costarica.txt, costarica.gif, costarica.eps:
  new file


Docs/mirrors.texi:
  Update

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0