Docs/manual.texi:
  fix agreement

include/my_pthread.h:
  Auto merged

Portability fixes for HPUX
Rename of CHECK_LOCK to IS_FREE_LOCK
Apply lower_case_table_names also to databases
Cleanup of describe code
Don't allow \ in database names


Build-tools/Do-compile:
  Added option --make-options
Docs/manual.texi:
  Changelog
  Added XOR, ^ and IS_FREE_LOCK() descriptions
acinclude.m4:
  Update for running gcc 3.x on HPUX
client/mysql.cc:
  Portability fix
client/mysqlbinlog.cc:
  Fix for using gcc 3.1
configure.in:
  Fix for using gcc 3.1
include/my_global.h:
  Fix for using gcc 3.1
include/my_pthread.h:
  Removed warning on HPUX
innobase/configure.in:
  Portability fix (for gcc 3.1 on HPUX)
innobase/ut/ut0ut.c:
  Portability fix (for gcc 3.1 on HPUX)
mysql-test/r/func_test.result:
  Test of new functions
mysql-test/r/rpl_get_lock.result:
  Test of new functions
mysql-test/t/func_test.test:
  Test of new functions
mysql-test/t/rpl_get_lock.test:
  Test of new functions
mysys/my_tempnam.c:
  Portability fix
sql/item_cmpfunc.cc:
  Added comments to Item_cond_xor.
  Fixed NULL handling for XOR
sql/item_create.cc:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_create.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_func.cc:
  Cleanup XOR handling
sql/item_func.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/lex.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/mysqld.cc:
  Moved chroot() to be exectued earlier.
sql/sql_db.cc:
  Apply lower_case_table_names also to databases
sql/sql_parse.cc:
  Apply lower_case_table_names also to databases
sql/sql_select.cc:
  Cleanup describe code (after Sinisa's patch for EXPLAIN + UNION)
sql/table.cc:
  Don't allow \ in database names

include/my_pthread.h:
  small bug in #define
sql/sql_handler.cc:
  bug in order of #includes

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

Docs/manual.texi:
  preliminary fixups to XOR, CHECK_LOCK() change notes.

include/my_sys.h:
  Removed not needed macro (SAFE_MUTEX can handle this case better).
sql/log.cc:
  Simple optimization
sql/log_event.cc:
  Fix problem in LOAD DATA if table_name is NULL (unlikely event)
sql/log_event.h:
  cleanup
sql/slave.cc:
  remove unnecessary assert

This is also my first attempt to commit and push


include/my_global.h:
  Small typo
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


Docs/manual.texi:
  Auto merged

* binary XOR
* logical XOR
* CHECK_LOCK("lock_name")

(Needed for query cache for systems which doesn't have native semaphores)


mysys/my_getopt.c:
  Safety fix.
mysys/my_winsem.c:
  Shange all semaphore code to be uniform
mysys/thr_rwlock.c:
  cleanup
sql/gen_lex_hash.cc:
  Error message if wrong number of arguments.
sql/slave.cc:
  R

Portability fixes.
Removed compiler warnings.



VC++Files/client/mysql.dsp:
  Updated to 4.0.2
VC++Files/client/mysqladmin.dsp:
  Updated to 4.0.2
VC++Files/client/mysqlclient.dsp:
  Updated to 4.0.2
VC++Files/client/mysqldump.dsp:
  Updated to 4.0.2
VC++Files/client/mysqlimport.dsp:
  Updated to 4.0.2
VC++Files/client/mysqlshow.dsp:
  Updated to 4.0.2
VC++Files/innobase/innobase.dsp:
  Updated to 4.0.2
VC++Files/libmysql/libmySQL.dsp:
  Updated to 4.0.2
VC++Files/libmysqltest/myTest.dsp:
  Updated to 4.0.2
VC++Files/merge/merge.dsp:
  Updated to 4.0.2
VC++Files/myisam/myisam.dsp:
  Updated to 4.0.2
VC++Files/mysql.dsw:
  Updated to 4.0.2
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Updated to 4.0.2
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Updated to 4.0.2
VC++Files/mysqlmanager/MySqlManager.dsp:
  Updated to 4.0.2
VC++Files/mysys/mysys.dsp:
  Updated to 4.0.2
VC++Files/pack_isam/pack_isam.dsp:
  Updated to 4.0.2
VC++Files/perror/perror.dsp:
  Updated to 4.0.2
VC++Files/replace/replace.dsp:
  Updated to 4.0.2
VC++Files/sql/mysqld.dsp:
  Updated to 4.0.2
VC++Files/test1/test1.dsp:
  Updated to 4.0.2
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Updated to 4.0.2
VC++Files/thr_test/thr_test.dsp:
  Updated to 4.0.2
VC++Files/vio/vio.dsp:
  Updated to 4.0.2
VC++Files/zlib/zlib.dsp:
  Updated to 4.0.2
include/config-win.h:
  Added isnan() and finite()
include/myisam.h:
  Move thr_xxx functions to myisam_priv.h
myisam/mi_check.c:
  Portability fix.
myisam/mi_locking.c:
  Comment cleanup
myisam/myisamchk.c:
  Removed compiler warning
myisam/myisamdef.h:
  Added thr_xxx functions
myisam/sort.c:
  Portability fix
sql/field.cc:
  Portability fix
sql/sql_insert.cc:
  R

Portability fix in safemalloc.c


libmysqld/lib_sql.cc:
  Removed not needed define
myisam/sort.c:
  Fixed core dump crash in repair table.
mysql-test/r/myisam.result:
  Test for repair table
mysql-test/t/myisam.test:
  Test for repair table
mysys/safemalloc.c:
  Portability fix

BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31:
  Delete: mysys/getvar.c
zlib/zlib.dsp:
  Turn on EOLN_NATIVE flag
libmysql/Makefile.shared:
  Remove getvar.c
myisam/mi_cache.c:
  Indentation cleanup
myisam/mi_check.c:
  Indentation cleanup
  Changed name of a variable
myisam/sort.c:
  Indentation cleanup
  Added initialization of a variable
myisammrg/myrg_delete.c:
  Indentation cleanup
myisammrg/myrg_rsame.c:
  Indentation cleanup
myisammrg/myrg_update.c:
  Indentation cleanup
myisammrg/myrg_write.c:
  Indentation cleanup
mysys/Makefile.am:
  removed getvar.c
sql/field.cc:
  Added warning counter to overflow() (and removed this from other places)

VC++Files/mysql.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/mysql.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysql.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqladmin.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqlclient.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqlclient.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqldump.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqlimport.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqlshow.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/dbug/dbug.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/dbug/dbug.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/heap/heap.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/innobase/innobase.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/isam/isam.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/isam/isam.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/isamchk/isamchk.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/libmysql/libmySQL.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/libmysql/libmysql.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/libmysqltest/myTest.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/libmysqltest/mytest.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/merge/merge.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/merge/merge.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/myisam/myisam.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/myisamchk/myisamchk.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/myisamlog/myisamlog.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/myisammrg/myisammrg.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/myisampack/myisampack.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlmanager/MySqlManager.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlmanager/mysqlmanager.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlshutdown/myshutdown.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysys/mysys.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysys/mysys.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/pack_isam/pack_isam.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/perror/perror.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/regex/regex.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/regex/regex.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/replace/replace.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/sql/mysqld.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/sql/mysqldmax.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/strings/noMASM/strings.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/strings/strings.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/test1/test1.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/thr_test/thr_test.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/vio/vio.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/zlib/zlib.dsp:
  Turn on EOLN_NATIVE flag

into sanja.is.com.ua:/home/bell/mysql/work-mem-4.0

BitKeeper/etc/ignore:
  added scripts/mysql_tableinfo
sql/sql_parse.cc:
  Auto merged

Added statistics information for alarms (for bug tracking)
Don't store "incomplete" in the xxx.cfg file if we are not using --restart. (Crash-me)
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
Aded new script mysql_tableinfo to make a system directory.


Docs/manual.texi:
  Changelog and TODO
include/mysql.h:
  Removed mysql_ssl_clear() (One should use mysql_close() instead)
include/thr_alarm.h:
  Added info for alarms
libmysql/libmysql.c:
  Made mysql_ssl_clear() static
libmysql/libmysql.def:
  cleanup
libmysqld/libmysqld.def:
  cleanup
myisam/myisamchk.c:
  describe -> description
myisam/myisampack.c:
  Fixed copyright.
mysys/thr_alarm.c:
  Added statistics information for alarms (for bug tracking)
scripts/Makefile.am:
  Added mysql_table_info
sql-bench/crash-me.sh:
  Don't store "incomplete" in the xxx.cfg file if we are not using --restart.
  This was done becasue "incomplete" made it harder to quickly repeat a test that
  failed.
sql-bench/limits/mysql.cfg:
  Update to 1.58
sql/hostname.cc:
  Remved compiler warning
sql/item_func.cc:
  cleanup
sql/item_func.h:
  Cleanup
sql/mysql_priv.h:
  Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
sql/opt_range.cc:
  Removed purify warning
sql/sql_parse.cc:
  cleanup
sql/sql_test.cc:
  Added ala

Clarification of NOW() behaviour.

with a GRANT statement.

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

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

(as when previous myrg_rkey failed, e.g. found nothing)


myisammrg/myrg_delete.c:
  style fix
myisammrg/myrg_locking.c:
  style fix
myisammrg/myrg_rnext.c:
  do not crash on rprev/rnext if no current table (as when previous rkey failed, e.g. found nothing)
myisammrg/myrg_rprev.c:
  do not crash on rprev/rnext if no current table (as when previous rkey failed, e.g. found nothing)
myisammrg/myrg_rrnd.c:
  style fix
myisammrg/myrg_rsame.c:
  style fix
myisammrg/myrg_update.c:
  style fix
myisammrg/myrg_write.c:
  style fix

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