sql/mysqld.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

Add ISAM to Windows version
Fix of test results
Fixes for NULL keys in HEAP tables.


Docs/manual.texi:
  Changelog
heap/hp_open.c:
  Add support for NULL=NULL in keys (for GROUP BY)
heap/hp_rkey.c:
  Cleanup
heap/hp_write.c:
  Cleanup
include/config-win.h:
  Add ISAM to Windows version
include/my_base.h:
  Add support for NULL=NULL in keys (for GROUP BY)
libmysqld/Makefile.am:
  Rename of innobase to innodb
myisam/mi_write.c:
  Add support for NULL=NULL in keys (for GROUP BY)
BitKeeper/etc/ignore:
  Added libmysqld/ha_innodb.cc to the ignore list
mysql-test/r/group_by.result:
  Test of NULL keys in HEAP tables
mysql-test/r/heap.result:
  Test of NULL keys in HEAP tables
mysql-test/r/null.result:
  Cleanup
mysql-test/r/order_by.result:
  Fix for result of new ORDER BY optimization
mysql-test/t/group_by.test:
  Test of NULL keys in HEAP tables
mysql-test/t/heap.test:
  Test of NULL keys in HEAP tables
mysql-test/t/null.test:
  Cleanup
sql/ha_heap.cc:
  Add support of NULL keys
sql/item_strfunc.h:
  Fix for BINARY and CAST functions
sql/item_timefunc.h:
  Fix for BINARY and CAST functions
sql/sql_parse.cc:
  Cleanup
sql/sql_select.cc:
  Add support for NULL=NULL in keys (for GROUP BY)

  Added the MyCC list


Docs/manual.texi:
  Added the MyCC list

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


Docs/manual.texi:
  Auto merged

Fix, myisampack does support TEXT/BLOB according to texts elsewhere (comment from antoine.pichot@int-evry.fr).

Docs/manual.texi:
  SCCS merged

  Added missing 'Q' for -Q option


client/mysqldump.c:
  Added missing 'Q' for -Q option
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

incorporations of the new stuff.

When Monty approves / corrects it, I will "port" it to multi-table
updates.


sql/sql_insert.cc:
  A small bug fix
sql/sql_update.cc:
  query cache invalidation

Added ORDER BY optimization


Docs/manual.texi:
  Added ORDER BY optimisation section
heap/_check.c:
  Cleanup
heap/heapdef.h:
  Added support of null keys in HEAP tables
heap/hp_hash.c:
  Added support of null keys in HEAP tables
heap/hp_open.c:
  Added support of null keys in HEAP tables
heap/hp_test2.c:
  Added support of null keys in HEAP tables
heap/hp_write.c:
  Added support of null keys in HEAP tables
include/heap.h:
  Added support of null keys in HEAP tables
include/my_base.h:
  Support for hash algoritm
isam/static.c:
  Cleanup
myisam/mi_static.c:
  Cleanup
sql/Makefile.am:
  Rename innobase -> innodb
sql/ha_berkeley.cc:
  Added ORDER BY optimization
sql/ha_berkeley.h:
  Added ORDER BY optimization
sql/ha_heap.cc:
  Added support for NULL keys
sql/ha_heap.h:
  Added support for NULL keys
sql/ha_isam.cc:
  Added ORDER BY optimization
sql/ha_isam.h:
  Added ORDER BY optimization
sql/ha_isammrg.h:
  Added ORDER BY optimization
sql/ha_myisam.cc:
  Added ORDER BY optimization
sql/ha_myisam.h:
  Added ORDER BY optimization
sql/ha_myisammrg.cc:
  Added ORDER BY optimization
sql/ha_myisammrg.h:
  Added ORDER BY optimization
sql/handler.cc:
  Rename innobase -> innodb
sql/handler.h:
  Rename innobase -> innodb
sql/ha_innodb.cc:
  Rename innobase -> innodb
sql/ha_innodb.h:
  Rename innobase -> innodb
sql/mysqld.cc:
  Rename innobase -> innodb
sql/sql_delete.cc:
  Rename innobase -> innodb
sql/sql_select.cc:
  Added ORDER BY optimization
sql/sql_select.h:
  Added ORDER BY optimization

into sanja.is.com.ua:/home/bell/mysql/mysql-4

mysql-test/r/query_cache.result:
  Test changed according with new block sizes
mysql-test/t/query_cache.test:
  Test changed according with new block sizes

Docs/manual.texi:
  Added CAST and CONVERT descriptions into the release notes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

libmysql/libmysql.def:
  For to have the same order of the 3.23.XX stuff
libmysqld/lib_load.cc:
  For to have the file extension for VC++
libmysqld/lib_sql.cc:
  The VC++ compiler returns duplication define from
  net_serv.cc. If the same happens with Unix then
  those lines should be removed.
  VC++ file extension.
sql/mysqld.cc:
  Changes for Win32 Embedded Server.
sql/net_serv.cc:
  Sanja Fixes.
sql/sql_cache.cc:
  To avoid the crash on Win9x

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

  Update mirror listing


Docs/mirrors.texi:
  Update mirror listing

into sanja.is.com.ua:/home/bell/mysql/work

  Update mirror listing


Docs/mirrors.texi:
  Update mirror listing

  Updated mirror listing
slovenia.eps, slovenia.gif, slovenia.txt:
  new file


Docs/mirrors.texi:
  Updated mirror listing

This fixes the query cache problem on windows.


sql/net_serv.cc:
  Make query cache code independent of the MYSQL_SERVER define.

Fix for new bug in CREATE TABLE when sorting keys.


Docs/manual.texi:
  Added FOUND_ROWS() section.
include/my_base.h:
  Spatial index
include/myisam.h:
  Spatial index
include/mysql_com.h:
  Spatial index
myisam/ft_dump.c:
  Remove warnings.
mysys/hash.c:
  Fix for SUNPRO_C (Sun's Fortre compiler)
sql/sql_cache.cc:
  Fix for FLUSH QUERY CACHE.
sql/sql_cache.h:
  Fix for FLUSH QUERY CACHE.
sql/sql_table.cc:
  Fix for new bug when sorting keys.

sql/item_create.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged

  mirror updates


Docs/mirrors.texi:
  mirror updates

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Some small changes to the MySQL-PostgreSQL comparison.
sql/item_timefunc.cc:
  Fixed typo.
sql/sql_cache.cc:
  More debugging
sql/sql_cache.h:
  More debugging

mysql-test/r/handler.result:
  alter table test
mysql-test/t/handler.test:
  alter table test
sql/sql_handler.cc:
  bugfix

Cleanup of multi-table-delete in sql_yacc.yy
Changed syntax of MAXIMUM QUERIES PER HOUR to MAX_QUERIES_PER_HOUR to
not get too many reserved words.


Docs/manual.texi:
  Updated information about CAST
mysql-test/r/bigint.result:
  New CAST syntax
mysql-test/r/create.result:
  New CAST syntax
mysql-test/r/variables.result:
  Fix after merge with 3.23
mysql-test/t/bigint.test:
  New CAST syntax
mysql-test/t/create.test:
  New CAST syntax
sql/item_create.cc:
  New CAST syntax
sql/item_func.h:
  New CAST syntax
sql/item_timefunc.cc:
  New CAST syntax
sql/item_timefunc.h:
  New CAST syntax
sql/lex.h:
  Changed syntax to MAX_QUERIES_PER_HOUR to not get too many reserved words.
sql/mysql_priv.h:
  Cleanup multi-delete
sql/sql_parse.cc:
  Cleanup multi-delete
sql/sql_yacc.yy:
  Cleanup multi-delete.
  New CAST syntax.
  Removed some restricted words.

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

Docs/manual.texi:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Docs/manual.texi:
  Auto merged
client/client_priv.h:
  Auto merged
extra/resolveip.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/ha_innobase.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
client/mysqldump.c:
  Use local version in 4.0
configure.in:
  Use 4.0 code

Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX.


BUILD/FINISH.sh:
  Fixes for gcc 3.0
BUILD/SETUP.sh:
  Fixes for gcc 3.0
Docs/manual.texi:
  Changelog + SIGNED/UNSIGNED casts.
Makefile.am:
  include BUILD scripts in source distribution.
client/Makefile.am:
  Fixes for gcc 3.0
client/mysql.cc:
  Cleanup
client/mysqldump.c:
  Changed 'K' to mean 'disable-keys' instead of 'no-disabled-keys'
client/readline.cc:
  Cleanup
configure.in:
  Include BUILD in source distrbution
extra/my_print_defaults.c:
  Cleanup
include/my_global.h:
  Fix for HPUX and setrlimit.
  Portability fix.
  Added macros for nice TIMESPEC usage.
innobase/include/dyn0dyn.h:
  Fix for AIX
libmysql/Makefile.shared:
  Added strxmov to libmysqld
libmysqld/examples/Makefile.am:
  Fixes for gcc 3.0
libmysqld/lib_vio.c:
  Cleanup
myisam/ft_dump.c:
  Portability fixes
myisam/ftdefs.h:
  Portability fixes
mysql-test/r/bdb.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/bigint.result:
  New test for SIGNED/UNSIGNED
mysql-test/r/fulltext.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/heap.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/innodb.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/isam.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/key.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/myisam.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/query_cache.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/select.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/show_check.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/r/type_ranges.result:
  Cleanup results after adding 2 columns to SHOW KEYS
mysql-test/t/bigint.test:
  New test for SIGNED/UNSIGNED
mysql-test/t/key.test:
  New test for SIGNED/UNSIGNED
mysql-test/t/query_cache.test:
  Test for FOUND_ROWS()
sql-bench/crash-me.sh:
  Safety fixes
sql/derror.cc:
  Cleanup
sql/ha_berkeley.h:
  New test for SIGNED/UNSIGNED
sql/ha_heap.h:
  New test for SIGNED/UNSIGNED
sql/ha_innobase.cc:
  New test for SIGNED/UNSIGNED
sql/ha_innobase.h:
  New test for SIGNED/UNSIGNED
sql/ha_isam.h:
  New test for SIGNED/UNSIGNED
sql/ha_myisam.cc:
  New test for SIGNED/UNSIGNED
sql/ha_myisam.h:
  New test for SIGNED/UNSIGNED
sql/handler.h:
  New test for SIGNED/UNSIGNED
sql/item_func.cc:
  Cleanup TIMESPEC usage
sql/item_func.h:
  Added SIGNED / UNSIGNED casts
sql/lex.h:
  Added SIGNED / UNSIGNED casts
sql/mysqld.cc:
  Cleanup TIMESPEC usage
sql/net_pkg.cc:
  Cleanup
sql/net_serv.cc:
  Fixed core dump bug in net_clear()
sql/slave.cc:
  Cleanup
sql/sql_cache.cc:
  Back to using semaphores
sql/sql_cache.h:
  Back to using semaphores
sql/sql_insert.cc:
  Cleanup TIMESPEC usage
sql/sql_manager.cc:
  Cleanup TIMESPEC usage
sql/sql_parse.cc:
  Cleanup
sql/sql_repl.cc:
  Cleanup TIMESPEC usage
sql/sql_show.cc:
  Added 'Null' and 'Index_type' to SHOW INDEX.
sql/sql_table.cc:
  Sort keys in table in a more logical order.
sql/sql_yacc.yy:
  Support for SIGNED/UNSIGNED casts.

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

configure.in:
  Update to 3.23.48