Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  slave_read_timeout -> slave_net_timeout
sql/mysqld.cc:
  Documented slave_net_timeout

Docs/manual.texi:
  Auto merged

mysql-test/r/type_enum.result:
  fixed test after merge
mysql-test/r/type_set.result:
  fixed test after merge
mysys/Makefile.am:
  R

BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Docs/manual.texi:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/t/type_enum.test:
  Auto merged
mysys/mf_strip.c:
  Auto merged
mysys/raid.cc:
  Auto merged
include/my_net.h:
  merge
mysql-test/r/type_enum.result:
  merge
mysql-test/t/type_decimal.test:
  merge
mysys/Makefile.am:
  merge
sql/sql_db.cc:
  merge
sql/sql_parse.cc:
  merge

Docs/manual.texi:
  Added information about SET/ENUM

Remove end space from ENUM and SET strings


mysql-test/t/type_enum.test:
  Test of end space in enum's
Docs/manual.texi:
  Changelog
include/my_sys.h:
  Renamed stripp_sp -> strip_sp
mysql-test/r/type_enum.result:
  Test of end space in enums
mysys/Makefile.am:
  change stripp_sp -> strip_sp
mysys/mf_strip.c:
  change stripp_sp -> strip_sp
sql/sql_db.cc:
  change stripp_sp -> strip_sp
sql/sql_parse.cc:
  change stripp_sp -> strip_sp
  Remove end space from ENUM and SET strings

Fixed some portability things in my_gethostbyname_r
Portability fix for type_decimal.test


BUILD/SETUP.sh:
  Fixes for gcc 3.1
extra/resolveip.c:
  Cleanup
include/my_net.h:
  Portability fix for SCO
mysql-test/t/type_decimal.test:
  Portability fix for FreeBSD
mysys/Makefile.am:
  Portability fix for OSF1
mysys/raid.cc:
  Portability fix for OSF1

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Added DBUG_ code to lib_vio.c


client/mysqltest.c:
  Fixed core dump bug
libmysqld/lib_vio.c:
  Added DBUG_ code

BitKeeper/etc/logging_ok:
  auto-union
Docs/glibc-2.2.5.patch:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/r/group_by.result:
  merge
sql/sql_select.cc:
  merge

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


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/deleted/.del-sel000004.test~21904fbd1c95cb1:
  Delete: mysql-test/t/sel000004.test
BitKeeper/deleted/.del-sel000004.result~4b5fbc60d0d9754f:
  Delete: mysql-test/r/sel000004.result

BitKeeper/deleted/.del-sel000004.test~445526a8a20de101:
  Delete: mysql-test/t/sel000004.test
BitKeeper/deleted/.del-sel000004.result~360af2095c88cb8c:
  Delete: mysql-test/r/sel000004.result

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

BitKeeper/etc/ignore:
  Added mysys/getopt.c mysys/getopt1.c to the ignore list

into rhols221.arenanet.fi:/home/my/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union

mysqlmanager from using GNU getopt to use my_getopt.

Changed some files that just included old getopt.h to include
my_getopt.h now.

Fixed a bug in my_print_help() in my_getopt.c.

Made better documentation for option -G in mysql client.


client/mysql.cc:
  Documented --named-commands better.
myisam/ft_dump.c:
  Changed getopt to my_getopt.
myisam/ft_eval.c:
  Changed getopt to my_getopt.
myisam/ft_test1.c:
  Changed getopt to my_getopt.
myisam/mi_check.c:
  getopt.h -> my_getopt.h
myisam/mi_test1.c:
  Changed getopt to my_getopt.
myisam/myisampack.c:
  Changed getopt to my_getopt.
mysys/my_getopt.c:
  Fixed a bug when printing help for option that didn't have a
  description.
sql/gen_lex_hash.cc:
  Changed getopt to my_getopt.
tools/mysqlmanager.c:
  Changed getopt to my_getopt.
vio/test-ssl.c:
  getopt.h -> my_getopt.h
vio/test-sslclient.c:
  getopt.h -> my_getopt.h
vio/test-sslserver.c:
  getopt.h -> my_getopt.h
vio/viotest-ssl.c:
  getopt.h -> my_getopt.h
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  added new mirrors


Docs/mirrors.texi:
  added new mirrors
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into fred.bitbike.com:/home/arjen/mysql-4.0

Changed my_print_defaults, mysql_install, perror, resolve_stack_dump,
resolveip and pack_isam to use my_getopt.


client/client_priv.h:
  getopt -> my_getopt
client/mysql.cc:
  moved my_getopt.h under client_priv.h
client/mysqladmin.c:
  moved my_getopt.h under client_priv.h
client/mysqlbinlog.cc:
  moved my_getopt.h under client_priv.h
client/mysqlcheck.c:
  moved my_getopt.h under client_priv.h
client/mysqldump.c:
  moved my_getopt.h under client_priv.h
client/mysqlimport.c:
  moved my_getopt.h under client_priv.h
client/mysqlshow.c:
  moved my_getopt.h under client_priv.h
extra/my_print_defaults.c:
  Changed from getopt to use my_getopt
extra/mysql_install.c:
  Changed from getopt to use my_getopt
extra/perror.c:
  Changed from getopt to use my_getopt
extra/resolve_stack_dump.c:
  Changed from getopt to use my_getopt
extra/resolveip.c:
  Changed from getopt to use my_getopt
fs/mysqlcorbafs.c:
  Left reminder about my_getopt when this program is ready.
  Currently it's not being compiled.
isam/pack_isam.c:
  Changed from getopt to use my_getopt

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

client/mysqltest.c:
  Auto merged

Fixed problem with --password in mysql


client/mysql.cc:
  Fixed problem with --password in mysql
mysql-test/r/type_decimal.result:
  Portability fix
mysql-test/t/type_decimal.test:
  Portability fix

- some minor bugfixes
- made code more readable
- support for printing GET_BOOL type options in my_print_variables(),
  value is either TRUE or FALSE


client/mysqlbinlog.cc:
  Changes in my_getopt my_print_variables()
client/mysqlmanager-pwgen.c:
  Changes in my_getopt my_print_variables()
client/mysqlmanagerc.c:
  Changes in my_getopt my_print_variables()
client/mysqltest.c:
  Changes in my_getopt my_print_variables()
myisam/myisamchk.c:
  Changes in my_getopt my_print_variables()
mysys/my_getopt.c:
  Made code more readable.
  Fixed bug in my_print_variables().
  Added printing for options whether they are enabled or not
  FALSE / TRUE. This also separates GET_BOOL type options from
  variables that can actually take values as an argument.

client/mysqltest.c:
  Auto merged

myisam/mi_write.c:
  More DBUG_ statements

BitKeeper/deleted/.del-getopt.c~a2dce359c5c071b1:
  Delete: mysys/getopt.c
BitKeeper/deleted/.del-getopt1.c~e441714775f50c8f:
  Delete: mysys/getopt1.c

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