extern "C" {


client/mysqlbinlog.cc:
  #include <my_pthread.h>
include/my_pthread.h:
  #ifdef _cplusplus
  extern "C" {
  #endif

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


Docs/manual.texi:
  Auto merged

clean up PostgreSQL section

Docs/manual.texi:
  Auto merged

Fix bug in isamlog
Add argument types to function declarations.


Docs/manual.texi:
  Updated credits
client/mysql.cc:
  Fixes for OS2
client/mysqladmin.c:
  Fixes for OS2
client/mysqldump.c:
  Fixes for OS2
client/mysqlimport.c:
  Fixes for OS2
client/mysqltest.c:
  Fixes for OS2
dbug/dbug.c:
  Fixes for OS2.
  Use new C calling convention.
dbug/factorial.c:
  Fixes for OS2.
  Use new C calling convention.
include/errmsg.h:
  Fix for OS2
include/global.h:
  Fixes for OS2.
include/my_pthread.h:
  Fixes for OS2.
include/my_sys.h:
  Fixes for OS2.
include/mysql_com.h:
  Move defines to global.h
include/thr_alarm.h:
  Fixes for OS2.
isam/isamchk.c:
  Fixes for OS2.
  Add arguments to function declarations.
isam/isamlog.c:
  Fixes for OS2.
  Fix bug in logfile handling.
isam/test1.c:
  Add arguments to function decl
isam/test2.c:
  Add arguments to function declarations.
isam/test_all.res:
  Update result
libmysql/get_password.c:
  Fixes for OS2.
libmysql/libmysql.c:
  Fixes for OS2.
libmysql/net.c:
  Fixes for OS2.
libmysql/violite.c:
  Add arguments to function declarations.
merge/_locking.c:
  Add argument types to function declarations.
merge/close.c:
  Add argument types to function declarations.
merge/create.c:
  Add argument types to function declarations.
merge/extra.c:
  Add argument types to function declarations.
merge/open.c:
  Add argument types to function declarations.
merge/panic.c:
  Add argument types to function declarations.
merge/rsame.c:
  Add argument types to function declarations.
merge/update.c:
  Add argument types to function declarations.
myisam/ft_eval.c:
  Portability fix
myisam/ft_search.c:
  Portability fix
myisam/ft_test1.c:
  Portability fix
myisam/ftdefs.h:
  Portability fix
myisam/mi_check.c:
  Portability fix
myisam/mi_test1.c:
  Portability fix
myisam/mi_test2.c:
  Portability fix
myisam/mi_test_all.sh:
  Update to test for MACH variable
myisam/myisamlog.c:
  Cleanup
myisam/myisampack.c:
  Don't use variable 'new'
myisam/sort.c:
  Portability fix
myisammrg/myrg_delete.c:
  Add argument types to function declarations.
myisammrg/myrg_locking.c:
  Add argument types to function declarations.
myisammrg/myrg_open.c:
  Add argument types to function declarations.
myisammrg/myrg_panic.c:
  Add argument types to function declarations.
mysql-test/t/backup.test:
  Fix for OS2
mysql-test/t/show_check.test:
  Fix for OS2
mysys/charset.c:
  Dont use variable 'new'
mysys/default.c:
  Fixes for OS2.
mysys/getopt.c:
  Fixes for OS2.
mysys/getopt1.c:
  Fixes for OS2.
mysys/list.c:
  Don't use variable 'new'
mysys/mf_dirname.c:
  Fixes for OS2.
mysys/mf_format.c:
  Fixes for OS2.
mysys/mf_path.c:
  Fixes for OS2.
mysys/mf_qsort.c:
  Portability fix
mysys/mf_tempfile.c:
  Fixes for OS2.
mysys/my_clock.c:
  Fixes for OS2.
mysys/my_copy.c:
  Fixes for OS2.
mysys/my_create.c:
  Fixes for OS2.
mysys/my_getwd.c:
  Fixes for OS2.
mysys/my_init.c:
  Fixes for OS2.
mysys/my_lib.c:
  Fixes for OS2.
mysys/my_lock.c:
  Fixes for OS2.
mysys/my_malloc.c:
  Portability fix
mysys/my_mkdir.c:
  Fixes for OS2.
mysys/my_open.c:
  Fixes for OS2.
mysys/my_pthread.c:
  Fixes for OS2.
mysys/my_realloc.c:
  Fixes for OS2.
mysys/my_redel.c:
  Fixes for OS2.
mysys/my_static.c:
  Fixes for OS2.
mysys/my_tempnam.c:
  Fixes for OS2.
mysys/my_thr_init.c:
  Fixes for OS2.
mysys/my_write.c:
  Fixes for OS2.
mysys/test_charset.c:
  Fixes for OS2.
mysys/thr_alarm.c:
  Fixes for OS2.
mysys/tree.c:
  Fixes for OS2.
sql/field.cc:
  Fixes for OS2.
sql/field.h:
  Fixes for OS2.
sql/gen_lex_hash.cc:
  Fixes for OS2.
sql/hostname.cc:
  Fixes for OS2.
sql/item_func.cc:
  Fixes for OS2.
sql/item_strfunc.cc:
  Fixes for OS2.
sql/log_event.cc:
  Fixes for OS2.
sql/md5.c:
  Fixes for OS2.
sql/mini_client.cc:
  Fixes for OS2.
sql/mysql_priv.h:
  Fixes for OS2.
sql/mysqld.cc:
  Fixes for OS2.
sql/net_serv.cc:
  Fixes for OS2.
sql/slave.cc:
  Fixes for OS2.
sql/sql_base.cc:
  Fixes for OS2.
sql/sql_db.cc:
  Portability fix
sql/sql_insert.cc:
  Fixes for OS2.
sql/sql_load.cc:
  Fixes for OS2.
sql/sql_parse.cc:
  Fixes for OS2.
sql/sql_table.cc:
  Fixes for OS2.
sql/sql_udf.cc:
  Fixes for OS2.
sql/violite.c:
  Fixes for OS2.
strings/ctype-big5.c:
  Fixes for OS2.
strings/ctype-gbk.c:
  Fixes for OS2.
strings/ctype-sjis.c:
  Fixes for OS2.
strings/ctype-tis620.c:
  Fixes for OS2.
strings/ctype.c:
  Fixes for OS2.
strings/strnlen.c:
  Fixes for OS2.

Patches required by Gemini
Fix to properly detect if there is an active transaction in InnoDB
Fix to not lock thread structure when doing automatic rollback when thread ends
Allow -O lower_case_names=0 on UNIX


Docs/manual.texi:
  Some updates from mailing list.
  Changelog
client/mysqlbinlog.cc:
  Removed variables declared in net.c
configure.in:
  Added test for strtoll and fixed test for gethostname_r for AIX
mysql-test/t/innodb.test:
  Added test of active transactions
sql/field.cc:
  Patch required by Gemini
sql/field.h:
  Patch required by Gemini
sql/filesort.cc:
  Patch required by Gemini
sql/gen_lex_hash.cc:
  Update to support new syntax
sql/ha_gemini.cc:
  Patch required by Gemini
sql/ha_gemini.h:
  Patch required by Gemini
sql/ha_innobase.cc:
  Fix to properly detect if there is an active transaction in InnoDB
sql/handler.cc:
  Fix to properly detect if there is an active transaction in InnoDB
sql/handler.h:
  Fix to properly detect if there is an active transaction in InnoDB.
  Fix for Gemini
sql/lex.h:
  SHOW LOCKS
sql/mysqld.cc:
  Fix to not lock thread structure when doing automatic rollback when thread ends.
sql/share/portuguese/errmsg.txt:
  Update
sql/sql_class.cc:
  Fix to not lock thread structure when doing automatic rollback when thread ends.
sql/sql_class.h:
  Fix to properly detect if there is an active transaction in InnoDB
sql/sql_delete.cc:
  Fix for Gemini
sql/sql_parse.cc:
  Allow -O lower_case_names=0 on UNIX
sql/sql_select.cc:
  Fix for Gemini
sql/sql_table.cc:
  Allow -O lower_case_names=0 on UNIX
sql/sql_update.cc:
  Fix for Gemini
sql/sql_yacc.yy:
  For SHOW LOCKS
strings/strto.c:
  Portability fix

  Fixed danish SunSite mirror


Docs/manual.texi:
  Fixed danish SunSite mirror

Build-tools/Do-compile:
  Make shutdown safer
Docs/manual.texi:
  Fix of bad merge
sql/log.cc:
  cleanup
sql/sql_acl.cc:
  cleanup

BUILD/compile-solaris-sparc-purify:
  Build for purify, quantify and purecoverage

Docs/manual.texi:
  unedit old version;  Will reapply later

Let myisamchk generate a new checksum for compressed data.
Don't unconditionally force filenames to lower case on windows.
Update mysqltest to match 4.0 source (to get some of the new bug fixes into 3.23)


Docs/manual.texi:
  Link changes, and new comments about IA64 and about Sun workshop
client/mysqltest.c:
  Updated this to match the 4.0 source
include/config-win.h:
  Don't unconditionally force filenames to lower case on windows.
innobase/include/ut0ut.h:
  Portability fix
myisam/mi_cache.c:
  Fix problem where reported error number was -1
myisam/mi_check.c:
  Let myisamchk generate a new checksum for compressed data.
myisam/mi_packrec.c:
  Cleanup
myisam/myisamchk.c:
  Report checksum for compressed tables
mysql-test/t/bdb.test:
  Fix to match new mysqltest
mysql-test/t/err000001.test:
  Fix to match new mysqltest
mysql-test/t/fulltext.test:
  Fix to match new mysqltest
mysql-test/t/innodb.test:
  Fix to match new mysqltest
mysql-test/t/overflow.test:
  Fix to match new mysqltest
sql/ha_gemini.cc:
  Fix false -> FALSE
sql/share/estonian/errmsg.txt:
  Updated of translation
sql/share/swedish/errmsg.txt:
  Updated of translation
sql/sql_parse.cc:
  Don't unconditionally force filenames to lower case on windows.
sql/sql_table.cc:
  Don't unconditionally force filenames to lower case on windows.
sql/sql_test.cc:
  Write current directory when using 'mysqladmin debug'
strings/strto.c:
  Portability fix
strings/strtoll.c:
  Portability fix
strings/strtoul.c:
  Portability fix
strings/strtoull.c:
  Portability fix

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Fix typo

Docs/manual.texi:
  Added a note that tablespace has to be >= 10 MB

sql/ha_innobase.cc:
  Impove ref length estimate in a handle to eliminate a warning in filesort

Docs/manual.texi:
  Re-added sunet.se mirror

Docs/manual.texi:
  Removed mirror in UK

do val_int() on their arguments before starting the computation. 
Similar fixes are need for +-* and probably several other but I want
to make sure Monty is fine with my fix approach before changing a lot
of code. 

Amazingly,
this bug is not as critical as you would expect since very few functions do val_int()
on their arguments ( from_unixtime(), sec_to_time()), and those not
very frequently perform a computation on their floating point arguments.
which is probably why no one has yet reported this bug. Another 
possibility is that the result is usually wrong by no more than 5%,
which makes it hard to catch it. I found it when trying to compute mile
splits for 30:47 10K - it told me 5:07, and I knew it was wrong because
5:00 mile gives you 31:08. However, if I had not run as many 10K races,
I would have easily believed that 30:47 10K is a 5:07 mile pace and 
would not have noticed the bug.


mysql-test/r/func_time.result:
  another test for sec_to_time that exposes a long outstanding bug
mysql-test/t/func_time.test:
  another test for sec_to_time that exposes a long outstanding bug
sql/item_func.cc:
  fixed bug in Item_func_div::val_int()

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

sql/mini_client.cc:
  alarm around mc_mysql_connect()
sql/mysqld.cc:
  move end_slave() to the earlier part of shutdown
sql/sql_repl.cc:
  retry thr_alarm_kill() in case slave thread missed the signal in SLAVE STOP

  Fixed contributed software link


Docs/manual.texi:
  Fixed contributed software link

  Added mirror in Hong Kong


Docs/manual.texi:
  Added mirror in Hong Kong
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

innobase/sync/sync0sync.c:
  This inline assmebly does not compile on gcc-2.96 and Intel: remove it

Docs/manual.texi:
  Updated InnoDB section to reflect rel. .41

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

Replaced @strong{MySQL AB} with MySQL AB

row0sel.c	Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT
srv0start.c	Allow drive name followed by a ':' in a data file path
ha_innobase.cc	Allow drive name followed by a ':' in a data file path


sql/ha_innobase.cc:
  Allow drive name followed by a ':' in a data file path
innobase/srv/srv0start.c:
  Allow drive name followed by a ':' in a data file path
innobase/row/row0sel.c:
  Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqlbinlog.cc:
  Auto merged

Docs/manual.texi:
  Changelog

BitKeeper/etc/ignore:
  auto-union

BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Delete: bdb/include/rpc_server_ext.h
BitKeeper/deleted/.del-rpc_client_ext.h~85436ca9b5691338:
  Delete: bdb/include/rpc_client_ext.h
BitKeeper/etc/ignore:
  added bdb/include/rpc_client_ext.h

BitKeeper/etc/ignore:
  added include/widec.h

BitKeeper/etc/ignore:
  added */*_pure_*warnings
BUILD/compile-solaris-sparc:
  Optimized build for ultrasparc
sql/mysqld.cc:
  Made SIGTERM safer for Solaris as it sometimes delivered a not catched
  signal during shutdown