mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

Fix for creating read-only files on windows
Manual updates


BitKeeper/deleted/.del-acconfig.h~65f1202b3b5c345f:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-acconfig.h~7b620dbd69ea6074:
  ***MISSING WEAVE***
Docs/manual.texi:
  Small clarifications
BitKeeper/etc/ignore:
  Added Docs/manual.aux Docs/manual.cp Docs/manual.cps Docs/manual.dvi Docs/manual.fn Docs/manual.fns Docs/manual.ky Docs/manual.pg Docs/manual.toc Docs/manual.tp Docs/manual.vr Docs/manual_a4.ps Docs/manual_letter.ps to the ignore list
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
mysys/my_open.c:
  Fix for windows where some files where created read only
sql/ha_myisam.cc:
  Added 'checking table' to process-list status
sql/opt_range.cc:
  Cleanup
sql/share/czech/errmsg.sys:
  New error messages
sql/share/czech/errmsg.txt:
  New error messages
sql/share/italian/errmsg.sys:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages

BitKeeper/etc/ignore:
  auto-union
Docs/manual.texi:
  Auto merged
sql/opt_range.cc:
  SCCS merged

BitKeeper/etc/ignore:
  added PENDING/*

BitKeeper/etc/ignore:
  Added libmysql_r/ctype_extra_sources.c libmysql_r/conf_to_src libmysql_r/.libs/libmysqlclient_r.lai to the ignore list

mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
Docs/manual.texi:
  Clarifications
sql/opt_range.cc:
  Removed comment from critical code

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

    updates for temporary table replication, and docs for replicate-do/ignore-table
    updated change history
    fixed errors/warnings from makeinfo


Docs/manual.texi:
  updates for temporary table replication, and docs for replicate-do/ignore-table
  updated change history
  fixed errors/warnings from makeinfo
BitKeeper/etc/ignore:
  Added Docs/manual.log to the ignore list

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

fixed slave to preserve temp tables on slave stop; slave start
added abort-slave-event-count option to mysqld to test the above
added a test case for temp tables with a contantly aborting slave
removed warning in sql_parse.cc
fixed thimble.cc to compile


BitKeeper/etc/ignore:
  Added client/thimble support-files/mysql-3.23.29-gamma.spec to the ignore list
client/mysqltest.c:
  added while, let, and echo, added fractional sec sleep support
client/thimble.cc:
  fixes to make it compile
mysql-test/t/3.23/rpl000001.test:
  sleep less
mysql-test/t/3.23/rpl000002.test:
  sleep less
mysql-test/t/3.23/rpl000003.test:
  sleep less
mysql-test/t/3.23/rpl000005.test:
  sleep less
sql/mysqld.cc:
  --abort-slave-event count
sql/slave.cc:
  remember temp tables when slave thread termintates and restore them on
  slave start
sql/slave.h:
  --abort-slave-event-count
sql/sql_parse.cc:
  remove warning

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