sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

myisam/mi_debug.c:
  ***MISSING WEAVE***
Docs/internals.texi:
  Added coding guidelines
Docs/manual.texi:
  Changelog update + Win32 -> Windows
client/mysql.cc:
  Changed --no-named-commands to be on by default
client/mysqlimport.c:
  Bug fix
include/config-win.h:
  Update of supported functions
include/global.h:
  Removed compiler warning
libmysql/libmysql.c:
  Fix for Ia64
myisam/ChangeLog:
  Changelog
myisam/Makefile.am:
  Added file mi_dbug.c
myisam/ft_stopwords.c:
  Fix for Ia64
myisam/mi_delete_table.c:
  Extra debugging
myisam/mi_rename.c:
  Extra debugging
myisam/mi_rnext.c:
  Fixed bug with MIN and concurrent insert
myisam/mi_rprev.c:
  Fixed bug with MAX and concurrent insert
myisam/mi_search.c:
  Fixed bug with DECIMAL/NUMERIC keys
myisam/myisamdef.h:
  Extra debugging
scripts/make_binary_distribution.sh:
  Added thread safe mysql library
sql/ha_heap.cc:
  Fix of HEAP bug with range keys
sql/ha_heap.h:
  Fix of HEAP bug with range keys
sql/handler.cc:
  Optimizing
sql/handler.h:
  Optimizing
sql/lock.cc:
  More DEBUG + fix of RENAME bug
sql/mini_client.cc:
  Fix for Ia64
sql/mysql_priv.h:
  Fix for name locks
sql/mysqld.cc:
  Shorter message if wrong options
sql/opt_range.cc:
  Added TODO
sql/sql_base.cc:
  Fix for DROP TABLE
sql/sql_parse.cc:
  Fix of permission checking for CHECK TABLE
sql/sql_select.cc:
  Fix of using LEFT JOIN with empty table
sql/table.h:
  Fix for name locks
tests/fork_test.pl:
  Fixed typo

.del-config.flags	Delete: mit-pthreads/config.flags


BitKeeper/deleted/.del-config.flags:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-ac-types.h:
  Delete: mit-pthreads/include/pthread/ac-types.h

Makefile.am	modifications to help libmysql_r work with distcheck


Makefile.am:
  modifications to help libmysql_r work with distcheck
configure.in:
  modifications to help libmysql_r work with distcheck

sql-bench/Makefile.am:
  fixed syntax error

into infomag.ape.relarn.ru:/usr/home/serg/src/mysql.safe/bk/mysql


Docs/manual.texi:
  Auto merged

**************** !!! NOTE EVERYBODY: SYNTAX CHANGED !!! ********************
There's no COLLECTIONs now, full-text indexes can be created via the word
FULLTEXT, which should be used like UNIQUE.


myisam/mi_check.c:
  comments added
sql/lex.h:
  COLLECTION -> FULLTEXT
sql/item_func.h:
  ft-optimization: identical queries merging
sql/sql_select.cc:
  ft-optimization
sql/item_func.cc:
  ft-optimization: identical queries merging
sql/sql_base.cc:
  ft_optimization: identical queries merging
sql/sql_yacc.yy:
  COLLECTION -> FULLTEXT
myisam/ft_search.c:
  info->lastpot dealing
Docs/manual.texi:
  COLLECTION -> FULLTEXT

myisam/fulltext.h:
  stopwords moved to include/ft_global.h
myisam/mi_check.c:
  fulltext keys now can be repaired
include/ft_global.h:
  stopwords declaration
sql/ha_myisam.cc:
  bug in ::repair
sql/mysqld.cc:
  stopwords initialized with PRECOMPILED_STOPWORDS
include/Makefile.am:
  because `bk ci' set permissions to 444, the my_global.h
  should be removed, not overwritten.]

Build-tools/Do-all-build-steps:
  moved mkdir $WD/Logs to a useful place

Docs/manual.texi:
  merged

Docs/manual.texi:
  full-text manual added

Docs/manual.texi:
  Fixed syntax on 'LOAD DATA INFILE'

into localhost.polyesthetic.msg:/usr/local/src/my/work

errors related to changing the TYPELIB to CS_ID.


BitKeeper/deleted/.del-config.h.in:
  ***MISSING WEAVE***
mysys/charset.c:
  - fix numerous syntax errors from previous commit

sql/log_event.cc:
  changed uint to uint32 in all places where the code depended on 
  sizeof(uint) to be 4
sql/log_event.h:
  changed uint to uint32 in all places where the code depended on 
  sizeof(uint) to be 4
sql/slave.cc:
  Monty's I64 fix broke my fprintf(), to fix it, changed to use llstr() 
  to print mi->pos that has become ulonglong

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Documented the new replication features in 3.23.23

sql/share/charsets/Index:
  removed out-of-date win1251 character set

into localhost.polyesthetic.msg:/usr/local/src/my/work

german1.conf	- fixed several sort order problems


sql/share/charsets/german1.conf:
  - fixed several sort order problems
sql/share/charsets/latin1.conf:
  - fixed several sort order problems

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  ChangeLog entry for mysqlhotcopy update.
scripts/mysqlhotcopy.sh:
  Updated to use the new ``FLUSH TABLES table_list'' syntax.

Docs/manual.texi:
  Updated thread safe client chapter + new links
client/sql_string.cc:
  Update for Ia64
client/sql_string.h:
  Update for Ia64
extra/replace.c:
  Update for Ia64
include/config-win.h:
  Update for PHP
include/global.h:
  Update for PHP
isam/create.c:
  Update for Ia64
isam/delete.c:
  Update for Ia64
isam/write.c:
  Update for Ia64
libmysql/Makefile.shared:
  new file
libmysql/libmysql.c:
  Update for Ia64
libmysql/net.c:
  Update for Ia64
myisam/mi_delete.c:
  Update for Ia64
myisam/mi_search.c:
  Update for Ia64
sql/field.cc:
  Update for Ia64
sql/field.h:
  Update for Ia64
sql/item.h:
  Update for Ia64
sql/item_strfunc.cc:
  Update for Ia64
sql/lock.cc:
  Update for Ia64
sql/log.cc:
  Update for Ia64
sql/log_event.h:
  Update for Ia64
sql/net_serv.cc:
  Update for Ia64
sql/sql_list.h:
  Update for Ia64
sql/sql_parse.cc:
  Update for Ia64
sql/sql_rename.cc:
  Update for Ia64
sql/sql_select.cc:
  Update for Ia64
sql/sql_show.cc:
  Update for Ia64
sql/sql_string.cc:
  Update for Ia64
sql/sql_string.h:
  Update for Ia64
sql/time.cc:
  Update for Ia64

into localhost.polyesthetic.msg:/usr/local/src/my/work


configure.in:
  Auto merged

propogate those changes through the code.  This is so that there can
be holes in the list of charsets without breaking old tables.


configure.in:
  - changed pattern for getting number from charsets Index file
mysys/charset.c:
  - changed from using a TYPELIB to a CS_ID struct, so both the name
    and the number of a charset is stored in available_charsets
sql/share/charsets/Index:
  - made the number a real part of the Index file, not just a comment
sql/share/charsets/README:
  - order is no longer significant, but each charset must be paired
    with its number

sql/Makefile.am:
  Spelling mistake.

configure.in:
  Merged
Docs/manual.texi:
  Merged

sql/share/estonian/errmsg.sys:
  Rename: sql/share/estonia/errmsg.sys -> sql/share/estonian/errmsg.sys
sql/share/romanian/errmsg.sys:
  Rename: sql/share/romania/errmsg.sys -> sql/share/romanian/errmsg.sys

BitKeeper/deleted/.del-errmsg.sys:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-errmsg.txt:
  ***MISSING WEAVE***
sql/share/estonian/errmsg.txt:
  Rename: sql/share/estonia/errmsg.txt -> sql/share/estonian/errmsg.txt
sql/share/romanian/errmsg.txt:
  Rename: sql/share/romania/errmsg.txt -> sql/share/romanian/errmsg.txt
Docs/manual.texi:
  Language list corrected
configure.in:
  Language list corrected (AVAILABLE_LANGUAGES)

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

into localhost.polyesthetic.msg:/usr/local/src/my/work


Docs/manual.texi:
  Auto merged

--enable-thread-safe-client item to Change log.


Docs/manual.texi:
  - updated the description on version 3.23
  - added --enable-thread-safe-client item to Change log

BUILD/compile-pentium:
  Added build of multi-threaded library

Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Merge
sql/sql_yacc.yy:
  Merge

Fixes for RENAME TABLE
Portability fixes


Docs/manual.texi:
  FLUSH TABLES table_list
client/mysql.cc:
  Ia64 port
client/mysqladmin.c:
  Ia64 port
client/mysqldump.c:
  Ia64 port
client/mysqlimport.c:
  Ia64 port
client/mysqlshow.c:
  Ia64 port
client/readline.cc:
  Ia64 port
configure.in:
  Ia64 port
include/config-win.h:
  Ia64 port
include/thr_alarm.h:
  Ia64 port
myisam/myisamdef.h:
  Ia64 port
myisammrg/myrg_rkey.c:
  Ia64 port
mysys/thr_alarm.c:
  Easier compile of non threaded client
mysys/thr_lock.c:
  Easier compile of non threaded client
mysys/thr_mutex.c:
  Easier compile of non threaded client
sql-bench/crash-me.sh:
  Added test for RENAME + some ANSI SQL99 group functions
sql-bench/limits/mysql.cfg:
  New run
sql-bench/server-cfg.sh:
  Fix
sql-bench/test-insert.sh:
  Fix
sql/field.cc:
  Port to Ia64
sql/ha_berkeley.cc:
  Port to Ia64
sql/ha_myisam.cc:
  cleanup
sql/handler.cc:
  Port to Ia64
sql/hostname.cc:
  Port to Ia64
sql/item.cc:
  Port to Ia64
sql/item_create.cc:
  Port to Ia64
sql/item_func.cc:
  Port to Ia64
sql/item_strfunc.cc:
  Port to Ia64
sql/item_timefunc.cc:
  Port to Ia64
sql/lock.cc:
  Fix for RENAME
sql/log.cc:
  Port to Ia64
sql/log_event.h:
  Port to Ia64
sql/mini_client.cc:
  Port to Ia64
sql/mysql_priv.h:
  Port to Ia64
sql/mysqlbinlog.cc:
  Port to Ia64
sql/mysqld.cc:
  FLUSH TABLES table_list
sql/net_pkg.cc:
  Port to Ia64
sql/procedure.h:
  Port to Ia64
sql/share/swedish/errmsg.OLD:
  FLUSH TABLES table_list
sql/slave.cc:
  Port to Ia64
sql/sql_acl.cc:
  Port to Ia64
sql/sql_analyse.cc:
  Port to Ia64
sql/sql_analyse.h:
  Port to Ia64
sql/sql_base.cc:
  FLUSH TABLES table_list
sql/sql_class.cc:
  Port to Ia64
sql/sql_class.h:
  Port to Ia64
sql/sql_parse.cc:
  Port to Ia64
sql/sql_rename.cc:
  Fix of RENAME
sql/sql_show.cc:
  Port to Ia64
sql/sql_string.cc:
  Port to Ia64
sql/sql_string.h:
  Port to Ia64
sql/sql_table.cc:
  Fix of RENAME
sql/sql_udf.cc:
  Port to Ia64
sql/sql_yacc.yy:
  FLUSH TABLES table_list
sql/table.cc:
  Port to Ia64
sql/thr_malloc.cc:
  Port to Ia64
sql/time.cc:
  Port to Ia64
sql/unireg.cc:
  Port to Ia64