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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Auto merged
myisam/mi_write.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Auto merged
Build-tools/Do-compile:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
myisam/mi_locking.c:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_innobase.h:
  Auto merged
sql/handler.h:
  Auto merged
configure.in:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join_outer.result:
  merge
mysql-test/r/myisam.result:
  merge
mysql-test/t/innodb.test:
  merge
mysys/mf_iocache2.c:
  Skip changes in 3.23
sql/sql_select.cc:
  merge

Docs/manual.texi:
  Added information about RESET
sql/mysql_priv.h:
  Fixed wrong type
sql/sql_base.cc:
  Removed wrong info in DBUG output
sql/sql_class.cc:
  cleanup
sql/sql_parse.cc:
  Fixed wrong type

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


Docs/manual.texi:
  Auto merged

Replaced Gates fun.

Docs/manual.texi:
  Changelog
scripts/mysql_config.sh:
  Fix script to search in different directories for include and lib

Docs/manual.texi:
  ChangeLog
myisam/mi_locking.c:
  Remove wrong optimistic locking. (Doesn't affect MySQL)
mysys/my_init.c:
  Release character sets at end
scripts/mysqlhotcopy.sh:
  RAID tables are now copied

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


Docs/manual.texi:
  Auto merged

wrong menues - mostly leftover after grand manual massage - that broke texinfo file structure were removed
"MATCH in SELECT only" line from "MySQL deficiencies" removed


Docs/manual.texi:
  wrong menues - mostly obsolete after grand manual massage - that broke texinfo file structure were removed
  "MATCH in SELECT only" line from "MySQL deficiencies" removed

Docs/manual.texi:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/ft_dump.c:
  Merge

Changed some sql_alloc() -> thd->alloc()
Removed a lot of compiler warnings on Linux Alpha (64 bit)
Fixed some core dumps on 64 bit systems (wrong type for packet_len)


Docs/manual.texi:
  Added base information about the query cache.
include/hash.h:
  Export hash_replace
include/myisam.h:
  Update of query cache code
libmysql/net.c:
  Add casts to make things safe on 64 bit systems.
myisam/mi_write.c:
  Update of query cache code
myisammrg/myrg_extra.c:
  Update of query cache code
mysys/hash.c:
  Added safety check to hash_replace
sql/field.cc:
  Removed compiler warnings.
sql/field.h:
  Removed compiler warnings
sql/ha_myisam.cc:
  Fixed wrong type of packet_len
sql/item.h:
  Remove warnings
sql/log_event.cc:
  Cleanup
sql/log_event.h:
  Cleanup to make code more readable
sql/mf_iocache.cc:
  Fixed wrong type
sql/mysql_priv.h:
  Update of query cache code
sql/mysqld.cc:
  Update of query cache code
sql/net_serv.cc:
  Remove compiler warnings
sql/opt_range.h:
  Remove compiler warnings
sql/sql_cache.cc:
  Update of query cache code
sql/sql_cache.h:
  Update of query cache code
sql/sql_class.h:
  Cleanup
sql/sql_insert.cc:
  Use thd->alloc() instead of sql_alloc()
sql/sql_parse.cc:
  Fixed compiler warnings.
  Changed some sql_alloc() -> thd->alloc()
sql/sql_select.cc:
  Changed sql_alloc() -> thd_alloc()
sql/sql_select.h:
  Faster alloc()
sql/sql_show.cc:
  Update of query cache code
sql/sql_table.cc:
  Faster alloc()
sql/table.cc:
  Faster alloc()

  Add diagnostic code to catch possible space id or page no errors in the log


innobase/include/mtr0log.ic:
  Add diagnostic code to catch possible space id or page no errors in the log
innobase/include/buf0buf.ic:
  Add diagnostic code to catch possible space id or page no errors in the log

  Add fault tolerance: when a log record contains nonsensical space id or page number, stop log scan there


innobase/log/log0recv.c:
  Add fault tolerance: when a log record contains nonsensical space id or page number, stop log scan there

ft_dump.c	-l option - report word length distribution (for ft_max_word_len_for_sort)


myisam/ft_boolean_search.c:
  bugfix "+(aaa bbb) +ccc"
myisam/ft_dump.c:
  -l option - report word length distribution (for ft_max_word_len_for_sort)

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

BitKeeper/deleted/.del-build-tags~7afb7e785b80f97:
  Delete: build-tags

Remove some warnings


Docs/manual.texi:
  Solaris and gcc
include/ft_global.h:
  Remove warnings
include/myisam.h:
  Query cache
include/myisammrg.h:
  Query cache
include/mysql_com.h:
  Query cache
libmysqld/lib_sql.cc:
  Query cache
myisam/ft_boolean_search.c:
  Remove warnings
myisam/ft_dump.c:
  Remove warnings
myisam/ft_parser.c:
  Remove warnings
myisam/ft_static.c:
  Remove warnings
myisam/ft_update.c:
  Remove warnings
myisam/ftdefs.h:
  Remove warnings
myisam/mi_delete.c:
  Query cache
myisam/mi_locking.c:
  Query cache
myisam/mi_update.c:
  Query cache
myisam/myisamdef.h:
  Optimize for Ia64
myisammrg/myrg_extra.c:
  Query cache
mysys/mf_keycache.c:
  DBUG statements
regex/cclass.h:
  Remove warnings
regex/cname.h:
  Remove warnings
regex/main.c:
  Remove warnings
regex/regcomp.c:
  Remove warnings
regex/regcomp.ih:
  Remove warnings
regex/regerror.c:
  Remove warnings
regex/reginit.c:
  Remove warnings
regex/split.c:
  Remove warnings
sql-bench/test-connect.sh:
  Make tests query-cache safe.
sql-bench/test-transactions.sh:
  Fix for old perl versions
sql/convert.cc:
  Query cache
sql/ha_myisammrg.cc:
  Query cache
sql/ha_myisammrg.h:
  Query cache
sql/handler.cc:
  Query cache
sql/item_create.cc:
  Query cache
sql/item_func.cc:
  Remove warnings
sql/item_func.h:
  Remove warnings
sql/lex.h:
  Query cache
sql/mysql_priv.h:
  Query cache
sql/mysqld.cc:
  Query cache
sql/net_serv.cc:
  Query cache
sql/sql_cache.cc:
  Query cache
sql/sql_class.cc:
  Query cache
sql/sql_class.h:
  Query cache
sql/sql_db.cc:
  Query cache
sql/sql_delete.cc:
  Query cache
sql/sql_insert.cc:
  Query cache
sql/sql_parse.cc:
  Query cache
sql/sql_select.cc:
  Query cache
sql/sql_table.cc:
  Query cache
sql/sql_update.cc:
  Query cache
sql/sql_yacc.yy:
  Query cache

scripts/mysql_config.sh:
  get correct paths even if the user moves basedir

added test case that supposedly will crash mysqld built with 2.96

Docs/manual.texi:
  mysql_store_results() -> mysql_store_result()

mysql-test/r/fulltext.result:
  Update results

Docs/manual.texi:
  Auto merged

Free character sets properly (for embedded).
Add missing mutex in HANDLER CLOSE


Build-tools/Do-compile:
  Update for gcc 3.0
Docs/manual.texi:
  Update for gcc 3.0
myisam/mi_locking.c:
  Fix not critical bug in locking
myisam/myisamdef.h:
  Fix not critical bug in locking
mysys/my_init.c:
  Free character sets properly
mysys/my_seek.c:
  Remove warning
sql-bench/server-cfg.sh:
  Fix benchmarks to run with MySQL
sql/sql_handler.cc:
  Add missing mutex
sql/sql_update.cc:
  Clean up procinfo

Build-tools/Do-compile:
  Merge with 4.0
Docs/manual.texi:
  Changelog
mysql-test/r/innodb.result:
  New tests cases for ORDER BY
mysql-test/r/myisam.result:
  New tests cases for ORDER BY
mysql-test/t/innodb.test:
  New tests cases for ORDER BY
mysql-test/t/myisam.test:
  New tests cases for ORDER BY

Docs/manual.texi:
  Extended section about MySQL states.
client/get_password.c:
  Use stderr instead of stdout when asking for password
tests/mail_to_db.pl:
  Small cleanup
tools/mysqlmanager.c:
  Removed warning

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

  Fixed small bug


Docs/Support/docbook-fixup.pl:
  Fixed small bug

  Fixed some issues for O'Reilly.
  * Remove "mailto:" from @email{} references in XML output. Good for normal XML of course, but bad when printing.
  * Removing (Cross)References for sections that have been excluded from printed manual.
  * In several titles, spaces are missing. You see a title like: <title>Speed of <command>INSERT</command>Queries</title>.


Docs/Support/docbook-fixup.pl:
  Fixed some issues for O'Reilly.
  * Remove "mailto:" from @email{} references in XML output. Good for normal XML of course, but bad when printing.
  * Removing (Cross)References for sections that have been excluded from printed manual.
  * In several titles, spaces are missing. You see a title like: <title>Speed of <command>INSERT</command>Queries</title>.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

myisam/ft_dump.c:
  some help added

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