into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

mysql-test/r/innodb.result:
  remove handler test from innodb.test
mysql-test/t/innodb.test:
  remove handler test from innodb.test
sql/ha_innodb.cc:
  HANDLER support
sql/ha_innodb.h:
  HANDLER support
sql/handler.h:
  HANDLER support for InnoDB
sql/sql_handler.cc:
  HANDLER support for InnoDB

mysys/thr_alarm.c:
  Fixed portability problem with thr_alarm.c
readline/display.c:
  Removed compiler warning
sql/net_serv.cc:
  Added DBUG_ENTER in net_clear.

More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL


Build-tools/Do-compile:
  Always run test with --warnings during build
Docs/manual.texi:
  Changelog
configure.in:
  Use our version of RWLOCKS on UNIXWARE 7
include/my_pthread.h:
  Use our version of RWLOCKS on UNIXWARE 7
include/mysql_version.h.in:
  Fixed warning when compiling embedded server
include/mysqld_error.h:
  New error messages
libmysql/libmysql.c:
  Give connect error message on reconnect if it fails.
  Fixed possible buffer overflow in expand_error()
  Added error messages for some error conditions.
mysql-test/mysql-test-run.sh:
  Portability fixes:
  - Search after 'time' in path.
  - Search after mysqld in libexec
  - Remove end / when doing rm -r (fix for BSD)
  Clean up skip_test handling.
mysql-test/r/rpl_empty_master_crash.result:
  New results
mysql-test/t/rpl_empty_master_crash.test:
  Extended test
mysys/mf_iocache.c:
  Remember file position on failed read.
mysys/mf_iocache2.c:
  Fixed bug in filelength() call.
mysys/thr_alarm.c:
  Made alarm handling more threadsafe when use with DBUG.
mysys/thr_mutex.c:
  More debug info
sql/log_event.cc:
  More DBUG_PRINT statements.
sql/mini_client.cc:
  Better error reporting on failures.
  Return connect error on reconnect failure (instead of SERVER_GONE_ERROR)
  Fixed critical bug in alarm handling on connect (could leave an alarm event on indefinitely)
sql/mysql_priv.h:
  Fixed arguments to mysql_binlog_send()
sql/mysqld.cc:
  Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
sql/net_pkg.cc:
  Removed dead code
sql/net_serv.cc:
  Ensure that last_errno is set in net_real_write()
sql/repl_failsafe.cc:
  Code cleanup.
  Better error handling.
sql/share/czech/errmsg.txt:
  New error messages.
sql/share/danish/errmsg.txt:
  New error messages.
sql/share/dutch/errmsg.txt:
  New error messages.
sql/share/english/errmsg.txt:
  New error messages.
sql/share/estonian/errmsg.txt:
  New error messages.
sql/share/french/errmsg.txt:
  New error messages.
sql/share/german/errmsg.txt:
  New error messages.
sql/share/greek/errmsg.txt:
  New error messages.
sql/share/hungarian/errmsg.txt:
  New error messages.
sql/share/italian/errmsg.txt:
  New error messages.
sql/share/japanese/errmsg.txt:
  New error messages.
sql/share/korean/errmsg.txt:
  New error messages.
sql/share/norwegian-ny/errmsg.txt:
  New error messages.
sql/share/norwegian/errmsg.txt:
  New error messages.
sql/share/polish/errmsg.txt:
  New error messages.
sql/share/portuguese/errmsg.txt:
  New error messages.
mysql-test/r/rpl_log_pos.result:
  Updated results
mysql-test/t/rpl_log_pos.test:
  Added 'sleep' commands to make tests repeatable.
sql/share/romanian/errmsg.txt:
  New error messages.
sql/share/russian/errmsg.txt:
  New error messages.
sql/share/slovak/errmsg.txt:
  New error messages.
sql/share/spanish/errmsg.txt:
  New error messages.
sql/share/swedish/errmsg.txt:
  New error messages.
sql/share/ukrainian/errmsg.txt:
  New error messages.
sql/slave.cc:
  Code optimization and cleanup.
  More DBUG statements.
  Better cleanup if start slave fails.
  Better error messages from 'fetch_master_table'
  Thread safer handling of 'wait_for_pos'
sql/slave.h:
  Better handling of wait_for_pos
sql/sql_load.cc:
  Removed warning when setting an AUTO_INCREMENT field to NULL
sql/sql_parse.cc:
  Fixed calling of function that has changed.
sql/sql_repl.cc:
  More DBUG statements
  Give a proper error number from mysql_binlog_send() so that we know when we have to abort slaves.

Specifically mention Ruby in list of APIs (noted by Markus Jais).

Docs/manual.texi:
  fix typos

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

these work now and do the same thing: --lower-case-table-names,
--lower-case-table-names=1, -O lower-case-table-names=1,
--set-variable=lower-case-table-names=1

manual.texi	fix typo


Docs/manual.texi:
  fix option name typo

Fixed configure problems with HPUX and openbsd
SHOW SLAVE STATUS returns empty set if slave is not initialized
SHOW MASTER STATUS returns empty set if binary logging is not enabled.
Fixed shutdown problem on Solaris.


BitKeeper/deleted/.del-set_var.cc~5374527de1955359:
  Delete: libmysqld/set_var.cc
BitKeeper/etc/ignore:
  added libmysqld/set_var.cc
Build-tools/Do-compile:
  Remove warnings from touch during compilation
Docs/manual.texi:
  Changelog
client/mysqltest.c:
  Added real_sleep command
configure.in:
  Fixed type for HPUX10
innobase/configure.in:
  Fixed type for openbsd
libmysql/libmysql.c:
  Fix for new SHOW SLAVE STATUS
myisam/mi_update.c:
  Update key file if using external locking
mysql-test/mysql-test-run.sh:
  Safety fix
mysql-test/r/rpl000015.result:
  Update for new SHOW SLAVE STATUS
mysql-test/r/rpl_empty_master_crash.result:
  Update for new SHOW SLAVE STATUS
mysql-test/t/rpl000001.test:
  sleep -> real_sleep to avoid timing problem
sql/mysqld.cc:
  Fixed bug with SIGTERM on Solaris
sql/slave.cc:
  SHOW SLAVE STATUS returns empty sets if slave is not initialized.
sql/sql_repl.cc:
  SHOW MASTER STAT returns empty set if no binary logging.

Docs/manual.texi:
  fix missing word

Don't update MyISAM index file on UPDATE if index is not changed


Build-tools/Do-compile:
  Remove log files as early as possible
Docs/manual.texi:
  Changelog
BitKeeper/etc/ignore:
  Added myisam/test2.MYD myisam/test2.MYI to the ignore list
include/my_semaphore.h:
  Portability fix for SCO and BSDI
innobase/configure.in:
  Don't use inline with openbsd as this cases linker problems.
myisam/mi_update.c:
  Don't update index file on UPDATE if index is not changed
mysys/my_pthread.c:
  Portability fix for hpux
sql/item_cmpfunc.cc:
  Don't convert bigint to bigint

Docs/manual.texi:
  Auto merged

Fixed bug in SAFEMALLOC for systems that requires longlong data to be aligned on 8 byte boundaries (like sparc)
Removed thread marking of safemalloc blocks (becasue of alignment problems)
Temporary fix for bigint comparison.


configure.in:
  Added size checking of char*
BitKeeper/etc/ignore:
  Added sql-bench/innotest1 sql-bench/innotest1a sql-bench/innotest1b sql-bench/innotest2 sql-bench/innotest2a sql-bench/innotest2b to the ignore list
mysql-test/r/select.result:
  Cleaned up test
mysql-test/t/select.test:
  Cleaned up test
mysys/my_static.h:
  Fixed bug in SAFEMALLOC for systems that requires longlong data to be aligned on 8 byte boundaries (like sparc)
mysys/safemalloc.c:
  Fixed bug in SAFEMALLOC for systems that requires longlong data to be aligned on 8 byte boundaries (like sparc)
sql/field.h:
  Temporary fix for bigint comparison.
sql/gen_lex_hash.cc:
  Smaller hash table
sql/item_cmpfunc.cc:
  Cleanup
sql/mysqld.cc:
  Removed thread marking of safemalloc blocks (becasue of alignment problems)
sql/opt_range.cc:
  Comment

Docs/manual.texi:
  begin to clean up the SSL section

into hundin.mysql.fi:/my/bk/mysql-4.0


configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_pthread.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged

Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column.
Fixed bug in pthread_mutex_trylock with HPUX 11.0


Docs/manual.texi:
  Changelog
include/my_pthread.h:
  Fix for pthread_mutex_trylock when used with SAFEMUTEX
include/violite.h:
  Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in client code)
innobase/buf/buf0buf.c:
  Fixed wrong format string
libmysqld/lib_sql.cc:
  Fixed hangup in embedded server.
mysql-test/r/distinct.result:
  Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column
mysql-test/t/distinct.test:
  Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column
mysys/my_pthread.c:
  Cleanup of pthread_xxx rewrite code.
  Fixed bug in pthread_mutex_trylock with HPUX 11.0
sql/gen_lex_hash.cc:
  Smaller hash array
sql/mysqld.cc:
  Fixed hangup in embedded server.
sql/sql_select.cc:
  Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column
vio/vio.c:
  Added vio_ssl_blocking
vio/viossl.c:
  Added vio_ssl_blocking

into sinisa.nasamreza.org:/mnt/work/mysql-4.0


Docs/manual.texi:
  Auto merged

Same princpile can be applied to other expressions

Docs/manual.texi:
  fix typo

include/my_pthread.h:
  Fix for HPUX 11 and pthread_mutex_lock (merge from 4.0)
mysys/my_pthread.c:
  Fix for HPUX 11 and pthread_mutex_lock (merge from 4.0)

New fix for pthread_mutex_trylock for HPUX 10.20


BitKeeper/deleted/.del-mysql.dsp:
  Delete: VC++Files/mysql.dsp
BitKeeper/deleted/.del-mysqlshow.dsp:
  Delete: VC++Files/client/mysqlshow.dsp
BitKeeper/deleted/.del-dbug.dsp:
  Delete: VC++Files/dbug/dbug.dsp
BitKeeper/deleted/.del-dbug.dsw:
  Delete: VC++Files/dbug/dbug.dsw
BitKeeper/deleted/.del-heap.dsp:
  Delete: VC++Files/heap/heap.dsp
BitKeeper/deleted/.del-innobase.dsp:
  Delete: VC++Files/innobase/innobase.dsp
BitKeeper/deleted/.del-isam.dsp:
  Delete: VC++Files/isam/isam.dsp
BitKeeper/deleted/.del-isam.dsw:
  Delete: VC++Files/isam/isam.dsw
BitKeeper/deleted/.del-isamchk.dsp:
  Delete: VC++Files/isamchk/isamchk.dsp
BitKeeper/deleted/.del-libmySQL.dsp:
  Delete: VC++Files/libmysql/libmySQL.dsp
BitKeeper/deleted/.del-libmysql.dsw:
  Delete: VC++Files/libmysql/libmysql.dsw
BitKeeper/deleted/.del-mysql.dsw:
  Delete: VC++Files/mysql.dsw
BitKeeper/deleted/.del-myTest.dsp:
  Delete: VC++Files/libmysqltest/myTest.dsp
BitKeeper/deleted/.del-mytest.dsw:
  Delete: VC++Files/libmysqltest/mytest.dsw
BitKeeper/deleted/.del-merge.dsp:
  Delete: VC++Files/merge/merge.dsp
BitKeeper/deleted/.del-merge.dsw:
  Delete: VC++Files/merge/merge.dsw
BitKeeper/deleted/.del-myisam.dsp:
  Delete: VC++Files/myisam/myisam.dsp
BitKeeper/deleted/.del-myisamchk.dsp:
  Delete: VC++Files/myisamchk/myisamchk.dsp
BitKeeper/deleted/.del-myisamlog.dsp:
  Delete: VC++Files/myisamlog/myisamlog.dsp
BitKeeper/deleted/.del-myisammrg.dsp:
  Delete: VC++Files/myisammrg/myisammrg.dsp
BitKeeper/deleted/.del-myisampack.dsp:
  Delete: VC++Files/myisampack/myisampack.dsp
BitKeeper/deleted/.del-mysqlbinlog.dsp:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog.dsp
BitKeeper/deleted/.del-bdb.dsp:
  Delete: VC++Files/bdb/bdb.dsp
BitKeeper/deleted/.del-MySqlManager.dsp:
  Delete: VC++Files/mysqlmanager/MySqlManager.dsp
BitKeeper/deleted/.del-mysqlmanager.dsw:
  Delete: VC++Files/mysqlmanager/mysqlmanager.dsw
BitKeeper/deleted/.del-myshutdown.dsp:
  Delete: VC++Files/mysqlshutdown/myshutdown.dsp
BitKeeper/deleted/.del-mysqlshutdown.dsp:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.dsp
BitKeeper/deleted/.del-mysqlwatch.dsp:
  Delete: VC++Files/mysqlwatch/mysqlwatch.dsp
BitKeeper/deleted/.del-mysys.dsp:
  Delete: VC++Files/mysys/mysys.dsp
BitKeeper/deleted/.del-mysys.dsw:
  Delete: VC++Files/mysys/mysys.dsw
BitKeeper/deleted/.del-pack_isam.dsp:
  Delete: VC++Files/pack_isam/pack_isam.dsp
BitKeeper/deleted/.del-perror.dsp:
  Delete: VC++Files/perror/perror.dsp
BitKeeper/deleted/.del-regex.dsp:
  Delete: VC++Files/regex/regex.dsp
BitKeeper/deleted/.del-mysql.dsp~1:
  Delete: VC++Files/client/mysql.dsp
BitKeeper/deleted/.del-regex.dsw:
  Delete: VC++Files/regex/regex.dsw
BitKeeper/deleted/.del-replace.dsp:
  Delete: VC++Files/replace/replace.dsp
BitKeeper/deleted/.del-mysqld.dsp:
  Delete: VC++Files/sql/mysqld.dsp
BitKeeper/deleted/.del-mysqldmax.dsp:
  Delete: VC++Files/sql/mysqldmax.dsp
BitKeeper/deleted/.del-strings.dsp:
  Delete: VC++Files/strings/noMASM/strings.dsp
BitKeeper/deleted/.del-test1.dsp:
  Delete: VC++Files/test1/test1.dsp
BitKeeper/deleted/.del-thr_insert_test.dsp:
  Delete: VC++Files/thr_insert_test/thr_insert_test.dsp
BitKeeper/deleted/.del-thr_test.dsp:
  Delete: VC++Files/thr_test/thr_test.dsp
BitKeeper/deleted/.del-zlib.dsp~1:
  Delete: VC++Files/zlib/zlib.dsp
BitKeeper/deleted/.del-mysqladmin.dsp:
  Delete: VC++Files/client/mysqladmin.dsp
BitKeeper/deleted/.del-mysqlclient.dsp:
  Delete: VC++Files/client/mysqlclient.dsp
BitKeeper/deleted/.del-mysqlclient.dsw:
  Delete: VC++Files/client/mysqlclient.dsw
BitKeeper/deleted/.del-mysqldump.dsp:
  Delete: VC++Files/client/mysqldump.dsp
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
BitKeeper/deleted/.del-mysqlimport.dsp:
  Delete: VC++Files/client/mysqlimport.dsp
Docs/manual.texi:
  Auto merged
configure.in:
  merge
mysys/my_pthread.c:
  New fix for pthread_mutex_trylock for HPUX
sql-bench/Makefile.am:
  merge with 3.23.53

Docs/manual.texi:
  Changelog

 - Added 3.23.53 News section to the manual
 - Updated version number in configure.in to 3.23.53


Docs/manual.texi:
  Added News section for 3.23.53
configure.in:
  Bumped up version number to 3.23.53 now that 3.23.52 is released

  Add multithreaded stress tests for InnoDB
  new file


sql-bench/innotest1.sh:
  Add multithreaded stress tests for InnoDB
sql-bench/innotest1a.sh:
  Add multithreaded stress tests for InnoDB
sql-bench/innotest1b.sh:
  Add multithreaded stress tests for InnoDB
sql-bench/innotest2.sh:
  Add multithreaded stress tests for InnoDB
sql-bench/innotest2a.sh:
  Add multithreaded stress tests for InnoDB
sql-bench/innotest2b.sh:
  Add multithreaded stress tests for InnoDB
sql-bench/Makefile.am:
  Add multithreaded stress tests for InnoDB

Docs/manual.texi:
  Add missing 's' to -with-extra-charset