into serg.mylan:/usr/home/serg/Abk/mysql-5.0

mysql-test/r/strict.result:
  fixed
mysql-test/r/view.result:
  rolled back
mysql-test/t/information_schema.test:
  fix for 2GB file size limit
mysql-test/t/ps_1general.test:
  fix for 2GB file size limit
mysql-test/t/view.test:
  fix for 2GB file size limit
sql/field.cc:
  double->int conversion troubles
  cleanup
sql/item_cmpfunc.h:
  warning fixed
sql/sql_select.cc:
  division by zero fixed

  Grammar fix.
user.r:
  A few typo fixes.


dbug/user.r:
  A few typo fixes.
dbug/monty.doc:
  Grammar fix.

  Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later


mysql-test/t/ndb_grant.later:
  Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later

client/mysqladmin.cc:
  Added option to close the screen on exit for Netware.
netware/comp_err.def:
  Copyright notice change, for Netware.
netware/isamchk.def:
  Copyright notice change, for Netware.
netware/isamlog.def:
  Copyright notice change, for Netware.
netware/libmysql.def:
  Copyright notice change, for Netware.
netware/my_print_defaults.def:
  Copyright notice change, for Netware.
netware/myisam_ftdump.def:
  Copyright notice change, for Netware.
netware/myisamchk.def:
  Copyright notice change, for Netware.
netware/myisamlog.def:
  Copyright notice change, for Netware.
netware/myisampack.def:
  Copyright notice change, for Netware.
netware/mysql.def:
  Copyright notice change, for Netware.
netware/mysql_install.def:
  Copyright notice change, for Netware.
netware/mysql_install_db.def:
  Copyright notice change, for Netware.
netware/mysql_test_run.def:
  Copyright notice change, for Netware.
netware/mysql_waitpid.def:
  Copyright notice change, for Netware.
netware/mysqladmin.def:
  Copyright notice change, for Netware.
netware/mysqlbinlog.def:
  Copyright notice change, for Netware.
netware/mysqlcheck.def:
  Copyright notice change, for Netware.
netware/mysqld.def:
  Copyright notice change, for Netware.
netware/mysqld_safe.def:
  Copyright notice change, for Netware.
netware/mysqldump.def:
  Copyright notice change, for Netware.
netware/mysqlimport.def:
  Copyright notice change, for Netware.
netware/mysqlshow.def:
  Copyright notice change, for Netware.
netware/mysqltest.def:
  Copyright notice change, for Netware.
netware/pack_isam.def:
  Copyright notice change, for Netware.
netware/perror.def:
  Copyright notice change, for Netware.
netware/replace.def:
  Copyright notice change, for Netware.
netware/resolve_stack_dump.def:
  Copyright notice change, for Netware.
netware/resolveip.def:
  Copyright notice change, for Netware.
sql/mysqld.cc:
  Changes to fix the abend on NetWare on recieving the server down and volume deactivation
  events. Do not join for the main thread if these events occur.

  added missing return


ndb/src/ndbapi/NdbScanOperation.cpp:
  added missing return

sql/examples/ha_archive.cc:
  Added support for delayed inserts. What delayed inserts mean for archive is that a sync call is not forced with the next select. Instant performance gain, plus if you aren't concerned about having a consistant read you won't be forced to have less then optimized compression.
sql/examples/ha_archive.h:
  Added flags for dalyed inserts and added table flag so that the server knows that archive can support them.

into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

ndb/include/ndbapi/NdbScanOperation.hpp:
  Improved doc. a bit
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Set error code
ndb/src/ndbapi/NdbScanOperation.cpp:
  Check error directly after taking mutex
ndb/test/ndbapi/testScan.cpp:
  new scan test with lots of threads
ndb/test/run-test/daily-basic-tests.txt:
  Added two more scan tests
  Collapsed testTransactions & testOperations

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/slave.cc:
  Auto merged
mysql-test/r/select.result:
  !bk-eb
mysql-test/t/select.test:
  !bk-eb

 * Don't try building ROR-intersect if the queried table has zero rows
 * Don't ever produce an estimate of zero returned rows.

BitKeeper/etc/logging_ok:
  auto-union
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/slave.cc:
  Auto merged

more max_rows for show table status
comment spellchecking...


mysql-test/r/view.result:
  more max_rows for show table status
mysql-test/t/view.test:
  more max_rows for show table status
  comment spellchecking...

strings/decimal.c:
  fix

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

fixed a bug that it discovered


include/my_sys.h:
  move TRASH to my_sys.h from sql_list.h
sql/field.h:
  use TRASH macro
sql/item.h:
  TRASH in delete
sql/item_func.h:
  never delete item's manually!
sql/opt_range.cc:
  TRASH in delete
sql/sql_lex.h:
  TRASH in delete
sql/sql_list.h:
  move TRASH to my_sys.h from sql_list.h
sql/sql_parse.cc:
  don't use properties of deleted objects (even when it's safe)
sql/sql_select.cc:
  TRASH in delete
sql/sql_show.cc:
  TRASH in delete
sql/sql_string.h:
  TRASH in delete

  A work-around for SCO, disable use of clock_gettime


configure.in:
  A work-around for SCO, disable use of clock_gettime

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

dbug/user.r:
  help cralified
include/mysqld_error.h:
  new error message added
mysql-test/r/grant.result:
  results updated
mysql-test/r/grant2.result:
  results updated
mysql-test/t/grant.test:
  results updated
mysql-test/t/grant2.test:
  results updated
sql/share/czech/errmsg.txt:
  error message updated
sql/share/danish/errmsg.txt:
  error message updated
sql/share/dutch/errmsg.txt:
  error message updated
sql/share/english/errmsg.txt:
  error message updated
sql/share/estonian/errmsg.txt:
  error message updated
sql/share/french/errmsg.txt:
  error message updated
sql/sql_acl.cc:
  changed error reporting for create/drop/rename user to be consistent with drop table
sql/share/german/errmsg.txt:
  error message updated
sql/share/greek/errmsg.txt:
  error message updated
sql/share/hungarian/errmsg.txt:
  error message updated
sql/share/italian/errmsg.txt:
  error message updated
sql/share/japanese/errmsg.txt:
  error message updated
sql/share/korean/errmsg.txt:
  error message updated
sql/share/norwegian-ny/errmsg.txt:
  error message updated
sql/share/norwegian/errmsg.txt:
  error message updated
sql/share/polish/errmsg.txt:
  error message updated
sql/share/portuguese/errmsg.txt:
  error message updated
sql/share/romanian/errmsg.txt:
  error message updated
sql/share/russian/errmsg.txt:
  error message updated
sql/share/serbian/errmsg.txt:
  error message updated
sql/share/slovak/errmsg.txt:
  error message updated
sql/share/spanish/errmsg.txt:
  error message updated
sql/share/swedish/errmsg.txt:
  error message updated
sql/share/ukrainian/errmsg.txt:
  error message updated

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

mysql-test/r/rpl_start_stop_slave.result:
  results updated

  Reverts incomplete change of insert_fields()


sql/mysql_priv.h:
  Reverts incomplete change of insert_fields()

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_parse.cc:
  Auto merged

better truncation check in decimal2ulonglong

into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.1

Fix for bug#6756: Crash if SHOW INDEX


mysql-test/r/information_schema.result:
  portability fix(for powermac)
mysql-test/t/information_schema.test:
  portability fix(for powermac)