Docs/manual.texi:
  change log modification

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

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


Docs/manual.texi:
  Auto merged
sql/sql_insert.cc:
  Auto merged

Added missing mutex_unlock to slave replication code.


include/my_sys.h:
  removed init_count from IO_CACHE.
  General cleanup.
innobase/srv/srv0srv.c:
  Initailize slots to avoid purify warnings.
  Removed some compiler warnings.
mysql-test/mysql-test-run.sh:
  Automatic start of slave under gdb
mysys/mf_iocache.c:
  removed init_count
sql/field.cc:
  Cleanup
sql/log.cc:
  Cleanup
  added open_count variable.
sql/log_event.cc:
  cleanup
  use is_prefix instead of memcmp()
sql/repl_failsafe.cc:
  cleanup
sql/slave.cc:
  cleanup
  use MYSQL_LOG->open_count instead of IO_CACHE->init_count
  Added missing mutex_unlock()
sql/slave.h:
  cleanup
sql/sql_class.h:
  cleanup
  Added open_count to MYSQL_LOGL
sql/sql_parse.cc:
  removed compiler warning
sql/sql_repl.cc:
  added DBUG_xxx
sql/unireg.h:
  Added BIN_LOG_HEADER_SIZE

Docs/manual.texi:
  changelog

Docs/manual.texi:
  SCCS merged

Docs/manual.texi:
  Changelog
sql/mysqld.cc:
  Portability fix

Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Auto merged

Added syntax for column comments (for compability with 4.1)
Fix of ALTER TABLE RENAME


Docs/manual.texi:
  Changelog
client/mysqltest.c:
  Enable LOAD DATA LOCAL INFILE
mysql-test/r/alter_table.result:
  Test of syntax for column comments
mysql-test/r/func_math.result:
  Fixed test of new truncate
mysql-test/t/alter_table.test:
  Test of syntax for column comments
mysys/my_gethostbyname.c:
  Portability fix
sql/hostname.cc:
  Fixed pointer bug
sql/item_cmpfunc.cc:
  Optimizing LIKE code
sql/item_cmpfunc.h:
  Cleanup
sql/mysqld.cc:
  Avoid warning of duplicate calls to mysql_thread_init()
sql/sql_analyse.cc:
  Removed warning from DBUG
sql/sql_parse.cc:
  Avoid warning of duplicate calls to mysql_thread_init()
sql/sql_table.cc:
  Fix of ALTER TABLE RENAME
sql/sql_yacc.yy:
  Added syntax for field comments
vio/test-sslserver.c:
  Cleanup

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

user has table privilege and global FILE privilege

  Update mirror list


Docs/mirrors.texi:
  Update mirror list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

mysys/my_getopt.c:
  Fixed two bugs in my_getopt:
  
  - argc was decremented twice when type was GET_BOOL and short
    option was used. This caused all GET_BOOL -type short-options
    to malfunction.
  
  - Fixed a bug in argv handling. Any program that used argv directly
    without checking argc first, tried to use (already handled) options
    as non-option arguments, after all true non-option arguments were
    handled. At least mysqldump was affected by this bug.

BitKeeper/deleted/.del-rpl_empty_master_crash.result:
  Delete: mysql-test/r/rpl_empty_master_crash.result
BitKeeper/deleted/.del-rpl_empty_master_crash.test:
  Delete: mysql-test/t/rpl_empty_master_crash.test
configure.in:
  Auto merged
include/my_net.h:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/func_math.test:
  Auto merged
mysys/my_gethostbyname.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

client/mysqltest.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged

Added checking of sem_init() in configure.


client/mysqltest.c:
  Cleanup
configure.in:
  Added checking of sem_init
sql/hostname.cc:
  Portability fix
sql/slave.cc:
  Fixed bug in wait_for_relay_log_space()

into nick.leippe.com:/home/nick/mysql/mysql

added respective test case


sql/slave.cc:
  fixed load table from master hang when host is empty

mysys/my_getopt.c:
  Fixed two bugs in my_getopt:
  - Didn't exit with error if a short option was not recognized. Fixed.
  - If unrecognized short option was not the first one in the list,
    printed "unknown option" error for wrong option. Fixed.

client/mysql.cc:
  Fixed a bug in option -N

Change TRUNCATE(number) to truncate towards zero for negative numbers
Fix NULL handling for DESCRIBE table_name


Docs/manual.texi:
  Update of TRUNCATE() information
configure.in:
  Fix for HPUX
extra/resolveip.c:
  Fix for SCO
include/my_net.h:
  Fix for HPUX
libmysql/libmysql.c:
  Removed warning on HPUX 10.20
mysql-test/r/func_math.result:
  Test of new TRUNCATE handling
mysql-test/t/func_math.test:
  Test of new TRUNCATE handling
mysys/my_gethostbyname.c:
  Portability fix
sql/item_func.cc:
  Change TRUNCATE(number) to truncate towards zero for negative numbers
sql/sql_show.cc:
  Fix NULL handling for DESCRIBE table_name

This fix should be merged into 4.0 and 4.1

client/mysql.cc:
  Fixed a bug that caused segmentation fault in internal 'tee' command.

support-files/my-huge.cnf.sh:
  added more complete sample master and slave configuration

Now it properly returns error.
Added respective test case.


sql/repl_failsafe.cc:
  fixed bug: load table from master w/ empty master would hang.
  Now it properly returns error.

  change mirror


Docs/mirrors.texi:
  change mirror

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