sql/handler.h:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged

slow - full table scan); ORDER BY now works with MATCH (slow, full table
scan)


myisam/ft_eval.c:
  ft_read_next compatibility
myisam/ft_test1.c:
  ft_read_next compatibility
include/ft_global.h:
  ft_read_next redesigned, ft_get_relevance introduced
sql/ha_myisam.cc:
  Many MATCH'es per query now allowed
sql/ha_myisam.h:
  Many MATCH'es per query now allowed
sql/handler.h:
  Many MATCH'es per query now allowed
sql/item_func.cc:
  Many MATCH'es per query now allowed
sql/item_func.h:
  Many MATCH'es per query now allowed
sql/sql_select.cc:
  Many MATCH'es per query now allowed
myisam/ft_search.c:
  HA_KEY_NOT_FOUND => HA_END_OF_FILE

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


sql/sql_table.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

field.


sql/sql_table.cc:
  - error if ALTER TABLE SET DEFAULT called on blob field

sql-bench/server-cfg.sh:
  Auto merged
Docs/manual.texi:
  Merged of manual

Docs/manual.texi:
  Updated for 3.23.23
myisam/mi_check.c:
  Fix for CHECK table
sql-bench/bench-init.pl.sh:
  Fix of benchmarks for PostgreSQL 7.0.2
sql-bench/server-cfg.sh:
  Fix of benchmarks for PostgreSQL 7.0.2
sql-bench/test-insert.sh:
  Fix of benchmarks for PostgreSQL 7.0.2
sql-bench/test-select.sh:
  Fix of benchmarks for PostgreSQL 7.0.2
sql/ha_myisam.cc:
  Fix for CHECK table
sql/handler.h:
  Fix for CHECK table
sql/lex.h:
  Fix for CHECK table
sql/sql_load.cc:
  Fix bug in delayed keys
sql/sql_table.cc:
  Fix for CHECK table
sql/sql_yacc.yy:
  Fix for CHECK table
sql/structs.h:
  Fix wrong type

Docs/manual.texi:
  Fix "dosen't"
dbug/monty.doc:
  Fix "dosen't"
isam/isamchk.c:
  Fix "dosen't"
libmysql/libmysql.c:
  Fix "dosen't"
sql-bench/server-cfg.sh:
  Fix "dosen't"
sql/sql_base.cc:
  Fix "dosen't"
sql/sql_test.cc:
  Fix "dosen't"
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok:
  Auto merged

Docs/manual.texi:
  Updated the changes in 3.23.22 and 3.23.23

client/Makefile.am:
  Fix for make/bitkeeper
configure.in:
  Fix for SCO and SHOW PROCESSLIST
include/Makefile.am:
  Fix for make/bitkeeper
libmysql/Makefile.am:
  Fix for make/bitkeeper
myisam/mi_check.c:
  Fixes for delayed key handling
sql-bench/Makefile.am:
  Fix for make/bitkeeper
sql/Makefile.am:
  Fix for make/bitkeeper
sql/sql_insert.cc:
  Added delay key creation to INSERT .. SELECT

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


BitKeeper/etc/logging_ok:
  Auto merged

sql/slave.cc:
  fixed a bug in LOAD TABLE FROM MASTER - the table was not being locked during repair
sql/sql_parse.cc:
  reverse the bookkeeping so that sql_parse.cc now matches Monty's

  manual.texi
  internals.texi

In the wake of Monty's latest revisions. :)


Docs/internals.texi:
  Language and readability fixups.
Docs/manual.texi:
  Various language fixups, etc.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/slave.cc:
  test change

BitKeeper/etc/logging_ok:
  Auto merged

sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  another bookkeeping commit during merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/sql_parse.cc:
  bookkeeping check in, needed to be able to pull Monty's version

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

bookkeeping commit - bk will not let me pull Monty's changes until I commit mine to my repository - this will not be pushed


sql/mysqld.cc:
  added explict net->timeout set to net_read_timeout before handshake

BitKeeper/deleted/.del-my_global.h:
  ***MISSING WEAVE***

Docs/Makefile.am:
  Removed typo
Docs/internals.texi:
  Added documentation about filesort
Docs/manual.texi:
  Lots of changes, including information about the password in the mysql.user table
config.h.in:
  ***MISSING WEAVE***
heap/hp_rnext.c:
  Fix of reading of read-next
include/config-win.h:
  Fix for Ia64
include/global.h:
  Fix for Ia64
include/my_base.h:
  Fix for Ia64
include/myisam.h:
  New repair options
isam/_dynrec.c:
  Typo fixes
isam/_search.c:
  Fix for Ia64
merge/rrnd.c:
  Fix of ORDER BY for MERGE tables
myisam/ft_eval.c:
  Fix for Ia64
myisam/ft_parser.c:
  Fix for Ia64
myisam/ft_static.c:
  Portability fixes
myisam/mi_check.c:
  Fix for Ia64 + delay key creation
myisam/mi_locking.c:
  Portability fixes
myisam/myisamdef.h:
  Fixes for automatic table repair
myisam/myisampack.c:
  Version number increment
myisammrg/myrg_rrnd.c:
  Fix of ORDER BY for mymerge tables
mysql.proj:
  Updated
mysys/charset.c:
  Fix for Ia64
mysys/mf_casecnv.c:
  Fix for Ia64
mysys/mf_pack.c:
  Fix for Ia64
mysys/mf_path.c:
  Fix for Ia64
mysys/mf_wfile.c:
  Fix for Ia64
mysys/my_alloc.c:
  Fix for Ia64
mysys/my_lib.c:
  Fix for Ia64
mysys/my_lread.c:
  Fix for Ia64
mysys/my_lwrite.c:
  Fix for Ia64
mysys/my_winthread.c:
  Fix for Ia64
mysys/string.c:
  Fix for Ia64
mysys/thr_alarm.c:
  Fix for Ia64
mysys/thr_rwlock.c:
  Fix of scheduler bug for systems without rw_locks
regex/regcomp.c:
  Fix for Ia64
regex/regex.h:
  Fix for Ia64
regex/regex2.h:
  Fix for Ia64
scripts/mysqlhotcopy.sh:
  Explicit version number (because of bitkeeper)
sql-bench/bench-init.pl.sh:
  New help message
sql-bench/server-cfg.sh:
  Updates for postgreSQL 7.0
sql/ChangeLog:
  Changelog
sql/field.cc:
  Fix of datetime function handling
sql/filesort.cc:
  More comments
sql/gen_lex_hash.cc:
  More options
sql/ha_berkeley.cc:
  Fix for part key reading
sql/ha_berkeley.h:
  Indentation
sql/ha_myisam.cc:
  Fix for delayed key creation
sql/ha_myisam.h:
  Fix for delayed key creation
sql/handler.h:
  Fix for delayed key creation
sql/item_func.cc:
  Fix of crash when using constant expression with UDF functions in WHERE
sql/item_timefunc.cc:
  Fix of datetime function handling
sql/mini_client.cc:
  Portability fix
sql/mysql_priv.h:
  Optimization of select initialization
sql/mysqld.cc:
  Portability fixes, thread cache and min argument for connect_timeout
sql/sql_load.cc:
  Delayed key handling
sql/sql_parse.cc:
  Portability fixes and select initialization optimization
sql/sql_select.cc:
  Small optimization + more comments
sql/sql_table.cc:
  Fix default value adding to blob with alter table + delayed index creation
sql/sql_yacc.yy:
  Optimized select initialization
sql/structs.h:
  Fix for part key read
strings/ctype-sjis.c:
  Fix for Ia64
strings/ctype-tis620.c:
  Fix for Ia64
strings/t_ctype.h:
  bk fix
support-files/mysql.spec.sh:
  Added comment
vio/viotest-ssl.cc:
  bk fix
vio/viotest-sslconnect.cc:
  bk fix
vio/viotest.cc:
  bk fix
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

PART I: Keys support for MyMERGE tables

myisammrg/             |
Makefile.am            |
mymrgdef.h             |   support for keys
myrg_open.c            |          &
myrg_queue.c           |   bugfixes
myrg_rfirst.c          |
myrg_rkey.c            |
myrg_rlast.c           |
myrg_rnext.c           |
myrg_rprev.c           |
myrg_rrnd.c            |

include/myisammrg.h    | rkey/rnext/etc prototyped

sql/                   |
ha_myisammrg.cc        | support for keys
ha_myisammrg.h         |

myisam/                |
mi_rkey.c              | buf==NULL extension, _mi_rkey()
mi_rnext.c             |
mi_rprev.c             |

include/queues.h       | reinit_queue() - same as init_queue, but w/o malloc
mysys/queues.c         |

PART II: Miscellaneous

myisam/common_words    | deleted (looks like I checked it in by mistake)

some files (like acconfig.h, Makefile.am, COPYING.LIB, etc)
                       | Change mode to -rw-r--r-- (by `chmod a-x ')



include/queues.h:
  Initial, from cvs
myisammrg/Makefile.am:
  Initial, from cvs
myisammrg/mymrgdef.h:
  Initial, from cvs
myisammrg/myrg_open.c:
  Initial, from cvs
mysys/queues.c:
  Initial, from cvs
BitKeeper/deleted/.del-common_words:
  ***MISSING WEAVE***
Makefile.am:
  Change mode to -rw-r--r--
include/mysql_version.h.in:
  Change mode to -rw-r--r--
libmysql/acconfig.h:
  ***MISSING WEAVE***
mysys/COPYING.LIB:
  Change mode to -rw-r--r--
sql/item_uniq.cc:
  Change mode to -rw-r--r--
sql/item_uniq.h:
  Change mode to -rw-r--r--
sql/share/Makefile.am:
  Change mode to -rw-r--r--
strings/ChangeLog:
  Change mode to -rw-r--r--
support-files/Makefile.am:
  Change mode to -rw-r--r--
myisam/mi_rkey.c:
  looks like rkey/rnext for MyMERGE is working
myisam/mi_rnext.c:
  looks like rkey/rnext for MyMERGE is working
myisammrg/myrg_queue.c:
  looks like rkey/rnext for MyMERGE is working
myisammrg/myrg_rkey.c:
  looks like rkey/rnext for MyMERGE is working
myisammrg/myrg_rnext.c:
  probably, works
myisammrg/myrg_rprev.c:
  probably, works
include/myisammrg.h:
  rkey/rnext/etc prototyped
myisam/mi_rprev.c:
  buf==NULL, extension
sql/ha_myisammrg.cc:
  support for keys
sql/ha_myisammrg.h:
  support for keys
myisammrg/myrg_rrnd.c:
  ORDER BY didn't work
acconfig.h:
  Change mode to -rw-r--r--

client/mysqladmin.c:
  Fixed up enums, arrays, and structs.  Much more readable.
  Corrected copyright notice on one version output.
  Corrected english on program description.

client/mysql.cc:
  Cleaned up some of the struct formatting.
  Fixed up the usage information.
  Changed the "current database" to "*** NONE ***" if there is no db.
  It used to be "*** NO ONE ***" which only makes sense to Finns. :)
myisam/myisampack.c:
  Fixed the License header.
  Monty verified in Monterey that myisampack's info was wrong.
  Fixed the Usage/Copyright info header.  myisampack *is* free now.
  Fixed up the Usage info to real english.

Spelling, grammar, updating.
Basic Maintenance.


Docs/manual.texi:
  Spelling, grammar, updating.
  Basic Maintenance.

Docs/manual.texi:
  Corrected node description from "alpha" to "beta"
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  - remove -DHAVE_INT_8_16_32 from recommended CFLAGS
configure.in:
  - add test for int8
acconfig.h:
  - add HAVE_INT_8_16_32

scripts/mysql_install_db.sh:
  - use @HOSTNAME@ instead of /bin/hostname
scripts/safe_mysqld-watch.sh:
  - use @HOSTNAME@ instead of /bin/hostname
scripts/safe_mysqld.sh:
  - use @HOSTNAME@ instead of /bin/hostname

include/my_pthread.h:
  - add const to [my_]sigwait() arg
mysys/my_pthread.c:
  - add const to [my_]sigwait() arg

repl-tests/test-repl-alter/run.test:
  added sleep to allow time for replication

added Monty's patch for alter table and LAST_INSERT_ID()
added a test case for replication of ALTER TABLE on a table with auto_increment


sql/item_func.cc:
  fixed a coredump in UDF
sql/sql_table.cc:
  fixed LAST_INSERT_ID() problem after ALTER TABLE on a table with auto_increment

acinclude.m4:
  - fixed typo that was breaking BDB configuration

scripts/safe_mysqld.sh:
  merged Tim's change fixing up the mess I've made

BitKeeper/etc/logging_ok:
  fixed logging_ok again

sql/ha_berkeley.h:
  - fix pack_key formal parameter name: key -> key_ptr
  
  - remove redundant (incorrect?) ha_berkeley:: from in front of
    position, create and delete_table members
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

work. Tim, if you don't like my fix, fix it better - I just needed to make
compile-pentium-debug work.


acinclude.m4:
  specifying the directory where bdb is installed explcitly did not work

scripts/safe_mysqld.sh:
  Added Tim's niceness fix

BUILD/compile-pentium-debug:
  --with-berkely-db was on a line by itself