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

 (wrong error code) but I'll push it so that Sergei could clean up
 my merge

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

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

There is now a mysql_server_init() function which needs to be
called at the beginning of the program (and _end() for the end
of the program).  This routine handles argument parsing for the
embedded server.

Use the embedded version of mysql_load_file() (ignore the LOCAL
argument, since the client and server are the same program).

There are now mysql_thread_init/end() functions for the client
to use in a multi-threaded app.  They are just wrappers for
my_thread_init/end().

Added record_rnd_buffer
Added --safe-user-create
Fix for ALTER TABLE RENAME on windows

Portability fixes
Fixed problem when giving wrong arguments to myisam_recover
Fix to remove warnings when using purify

enabled or not.

and sql-mode options.

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

(Chapter 8 Skipped, will be next.)

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

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

ibuf0ibuf.c	Fix a potential hang in database shutdown (not known if there is such, but let us play safe)

  Paste the libtool.m4 from libtool version 1.3.4
  into aclinclude.m4; this should make our configure
  work even when the user has libtool version 1.4
  installed.  This should be removed, and everyone
  should upgrade to libtool 1.4; until then, this is
  a quick hack to make things work.

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