Docs/manual.texi:
  merged
  big deletion by yfaktoro@nslinuxw2.bedford.progress.com undone
  (I have to make a decision durion merge)
  He should re-delete, if it's what he really wanted to do.

into nslinuxw2.bedford.progress.com:/users/devp/yfaktoro/bk/local


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  SHOW KEYS updated, NEWS updated

sql/opt_range.cc:
  bugfix (sel000033.test)

Docs/manual.texi:
  Fix typos in books section.

Docs/manual.texi:
  Updated/Added books and their descriptions/links.

into nslinuxw2.bedford.progress.com:/users/devp/yfaktoro/bk/local


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Howards changes

Docs/manual.texi:
  News: added mysql-multi.server.sh

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

handles running several mysqlds on one host easily.  Original
multi-server modifications made by Tim Bunce.

tools.


support-files/mysql.server.sh:
  - Look for basedir in /etc/my.cnf if my_print_defaults
    can't be found
  - use `@HOSTNAME@`.pid instead of mysqld.pid for
    pid_file, to match safe_mysqld

mysys/Makefile.am:
  rm -> rm -f, to get rid of silly "remove this r-------- ?"

sql/sql_show.cc:
  FULLEXT comment in SHOW KEYS

should now work the way you expect them to (process command-line
arguments consistently).


scripts/mysql_install_db.sh:
  - use mysql_print_defaults instead of awk hack
  - actually pass unrecognized options to mysqld, instead of
    ignoring them
  - recognize a [mysql_install_db] section of my.cnf
  - general cleanup
scripts/safe_mysqld.sh:
  - handle a relative pid-file the same way mysqld does
support-files/mysql.server.sh:
  - use mysql_print_defaults instead of awk hack
  - recognize a [mysql_server] section of my.cnf
  - handle a relative pid-file the same way mysqld does
  - general cleanup
Docs/manual.texi:
  - News item: safe_mysqld, mysql.server and mysql_install_db have
    been modified

sql/item_func.cc:
  bug with several fulltext indexes fixed

Docs/manual.texi:
  Added mirror in Chile.

Portability fixes


sql-bench/bench-init.pl.sh:
  Change mode to -rw-rw-r--
sql-bench/compare-results.sh:
  Change mode to -rw-rw-r--
sql-bench/run-all-tests.sh:
  Change mode to -rw-rw-r--
sql-bench/test-ATIS.sh:
  Change mode to -rw-rw-r--
sql-bench/test-alter-table.sh:
  Change mode to -rw-rw-r--
sql-bench/test-big-tables.sh:
  Change mode to -rw-rw-r--
sql-bench/test-connect.sh:
  Change mode to -rw-rw-r--
sql-bench/test-create.sh:
  Change mode to -rw-rw-r--
sql-bench/test-select.sh:
  Change mode to -rw-rw-r--
sql-bench/test-wisconsin.sh:
  Change mode to -rw-rw-r--
Docs/manual.texi:
  Added documentation for perror
myisam/mi_check.c:
  Portability fix
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
scripts/mysqlhotcopy.sh:
  Added --noindices
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark results
sql-bench/copy-db.sh:
  Changed multi_value_insert -> insert_multi_value
sql-bench/crash-me.sh:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/Adabas.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/access.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/access_odbc.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/frontbase.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/interbase.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/mimer.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/ms-sql.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/msql.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/mysql-3.22.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/mysql-3.23.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/mysql.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/oracle.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/limits/pg.cfg:
  Changed multi_value_insert -> insert_multi_value
sql-bench/print-limit-table:
  Better groups
sql-bench/server-cfg.sh:
  Changed multi_value_insert -> insert_multi_value
sql-bench/test-insert.sh:
  Changed multi_value_insert -> insert_multi_value
sql/ha_myisam.cc:
  Added warning of number of rows changed in optimize
sql/mysqlbinlog.cc:
  Portability fix
sql/mysqld.cc:
  Changed mysqld to take less stack and safer shutdown
sql/share/swedish/errmsg.OLD:
  update
sql/sql_base.cc:
  Fixed 'drop table' bug
sql/sql_parse.cc:
  Fixed bug in 'TRUNCATE'
sql/sql_show.cc:
  Don't lock keycache when you do 'show variables'

sql_manager.cc	manager_status is volatile


sql/mysql_priv.h:
  manager_status is volatile
sql/sql_manager.cc:
  manager_status is volatile

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


Docs/manual.texi:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

sql/ha_myisam.cc:
  merged
sql/share/russian/errmsg.txt:
  merged

opt_range.h	bugs with const_tables and filesort fixed
opt_range.cc	bugs with const_tables and filesort fixed
item_func.cc	bugs with const_tables and filesort fixed
ha_myisam.h	bugs with const_tables and filesort fixed
ha_myisam.cc	bugs with const_tables and filesort fixed
ft_search.c	bugs with const_tables and filesort fixed


myisam/ft_search.c:
  bugs with const_tables and filesort fixed
sql/ha_myisam.cc:
  bugs with const_tables and filesort fixed
sql/ha_myisam.h:
  bugs with const_tables and filesort fixed
sql/item_func.cc:
  bugs with const_tables and filesort fixed
sql/opt_range.cc:
  bugs with const_tables and filesort fixed
sql/opt_range.h:
  bugs with const_tables and filesort fixed
sql/share/russian/errmsg.txt:
  translated

Docs/manual.texi:
  Fixed another bad URL.

Docs/manual.texi:
  SCCS merged

Docs/manual.texi:
  Fixed bad crash-me uref.

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


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

added error code to master failed connect message


BitKeeper/etc/ignore:
  Added libmysql_r/acconfig.h libmysql_r/array.c libmysql_r/bchange.c libmysql_r/bmove.c libmysql_r/bmove_upp.c libmysql_r/charset.c libmysql_r/conf_to_src.c libmysql_r/ctype_autoconf.c libmysql_r/ctype-big5.c libmysql_r/ctype.c libmysql_r/ctype-czech.c libmysql_r/ctype-euc_kr.c libmysql_r/ctype-gb2312.c libmysql_r/ctype-gbk.c libmysql_r/ctype-sjis.c libmysql_r/ctype-tis620.c libmysql_r/ctype-ujis.c libmysql_r/dbug.c libmysql_r/default.c libmysql_r/dll.c libmysql_r/errmsg.c libmysql_r/errors.c libmysql_r/getopt1.c libmysql_r/getopt.c libmysql_r/get_password.c libmysql_r/getvar.c libmysql_r/int2str.c libmysql_r/is_prefix.c libmysql_r/libmysql.c libmysql_r/list.c libmysql_r/llstr.c libmysql_r/longlong2str.c libmysql_r/mf_casecnv.c libmysql_r/mf_dirname.c libmysql_r/mf_fn_ext.c libmysql_r/mf_format.c libmysql_r/mf_loadpath.c libmysql_r/mf_pack.c libmysql_r/mf_path.c libmysql_r/mf_tempfile.c libmysql_r/mf_unixpath.c libmysql_r/mf_wcomp.c libmysql_r/mulalloc.c libmysql_r/my_alloc.c libmysql_r/my_compress.c libm
sql/share/romanian/errmsg.sys:
  touched again
sql/slave.cc:
  print error code on failed connects
sql/sql_base.cc:
  use int4store() instead of direct ponter casts
libmysql_r/acconfig.h:
  ***MISSING WEAVE***

sql/mysqld.cc:
  minor formatting change

sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Auto merged

Run bootstrap in separate thread
Fix bug in FLUSH TABLES table_name


Docs/manual.texi:
  Updated ChangeLog
client/mysql.cc:
  Added info about compressed protocol
include/getopt.h:
  Fix for OS2
include/global.h:
  Fix for OS2
include/my_sys.h:
  Fix for OS2
include/mysql_com.h:
  Fix for OS2
include/thr_alarm.h:
  Cleanup up alarm struct for OS2 port
isam/isamchk.c:
  Fix for OS2
libmysql/libmysql.c:
  cleanup
libmysql/net.c:
  Use new thr_alarm
libmysql/violite.c:
  Fix for OS2
myisam/ChangeLog:
  Changes
myisam/mi_create.c:
  Use less stack
myisam/myisamchk.c:
  Fix for OS2
mysys/default.c:
  Fix for OS2
mysys/getopt.c:
  Fix for OS2
mysys/mf_format.c:
  Safety
mysys/mf_path.c:
  Fix for OS2
mysys/my_create.c:
  Fix for OS2
mysys/my_lock.c:
  Fix for OS2
mysys/my_open.c:
  Fix for OS2
mysys/thr_alarm.c:
  Use new thr_alarm struct
readline/input.c:
  Fix for OS2
readline/rltty.c:
  Fix for OS2
sql/ha_myisam.cc:
  Remove unnecessary fn_format
sql/my_lock.c:
  Use new thr_alarm
sql/mysql_priv.h:
  Changed bootstrap to run in separate thread to avoid problem with
  small stack
sql/mysqld.cc:
  Changed bootstrap to run in separate thread to avoid problem with
  small stack
sql/net_serv.cc:
  Use new thr_alarm
sql/sql_base.cc:
  Fix problem with FLUSH TABLE table_name
sql/sql_class.cc:
  Fix for new bootstrap
sql/sql_class.h:
  cleanup
sql/sql_delete.cc:
  cleanup
sql/sql_load.cc:
  Fix for OS2
sql/sql_parse.cc:
  Changed bootstrap to run in separate thread to avoid problem with
  small stack
sql/sql_select.cc:
  Reset used structure elements
sql/sql_table.cc:
  For OS2
sql/violite.c:
  For OS2

Docs/manual.texi:
  more berkeley db documentation

acinclude.m4:
  fix spelling in help: berkely -> berkeley

tasks for different handlers.  Add a callback from berkeley db to
delete log files that are no longer needed.


configure.in:
  enable berkeley dbugging when --with-debug is on
sql/Makefile.am:
  change handle_flush to a general maintenance manager thread
sql/mysql_priv.h:
  change handle_flush to a general maintenance manager thread
sql/mysqld.cc:
  change handle_flush to a general maintenance manager thread
sql/ha_berkeley.cc:
  add callback to delete unneeded log files

into nslinuxw2.bedford.progress.com:/users/devp/yfaktoro/bk/local


Docs/manual.texi:
  Auto merged