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

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

in GROUP BY , which fields can be NULL ....

thread_test and isamchk to use my_getopt.

Fixed a bug in my_getopt.


client/mysqlbinlog.cc:
  Changed mysqlbinlog.cc to use my_getopt.
client/mysqlmanager-pwgen.c:
  Changed mysqlmanager-pwgen to use my_getopt.
client/mysqlmanagerc.c:
  Changed mysqlmanagerc to use my_getopt.
client/mysqltest.c:
  Changed mysqltest to use my_getopt.
client/thread_test.c:
  Changed thread_test to use my_getopt.
isam/isamchk.c:
  Changed isamchk to use my_getopt.
mysys/my_getopt.c:
  Fixed a bug in printing options when option didn't have a comment.
  Added startup initializing and printing for 'GET_BOOL' type variables.
sql/mysql_priv.h:
  Changed type.
sql/mysqld.cc:
  Fixed a bug in --local-infile option.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fixed bug in new code for regexp LIKE NULL


BUILD/SETUP.sh:
  Fixes for gcc 3.1
BUILD/compile-solaris-sparc-debug:
  Fixes for gcc 3.1
BUILD/compile-solaris-sparc-purify:
  Fixes for gcc 3.1
BUILD/compile-solaris-sparc:
  Fixes for gcc 3.1
Docs/manual.texi:
  Fixed typo
include/violite.h:
  Fixes for gcc 3.1
mysql-test/r/func_concat.result:
  Updated test results
sql/item_cmpfunc.cc:
  Fixed bug in new code for regexp LIKE NULL

did not apply)

Docs/manual.texi:
  Auto merged

Docs/glibc-2.2.5.patch:
  Auto merged
strings/longlong2str-x86.s:
  Auto merged
strings/strings-x86.s:
  Auto merged

Fixed memory overrun bug in glibc patch
Updated french error messages


Docs/glibc-2.2.5.patch:
  Fixed memory overrun bug in glibc patch
sql/share/french/errmsg.txt:
  Updated french error messages (patch from Loic Le Loarer)
strings/longlong2str-x86.s:
  Updated from MySQL 4.0 (to make them work with gcc 3.0)
strings/strings-x86.s:
  Updated from MySQL 4.0 (to make them work with gcc 3.0)

Docs/glibc-2.2.5.patch:
  Auto merged
Docs/manual.texi:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

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


sql/sql_parse.cc:
  Auto merged

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

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


sql/sql_parse.cc:
  Auto merged

Before this change LOCK TABLES worked only with global and table
level privileges.

Docs/manual.texi:
  Added info about LIKE optimization
mysql-test/r/func_like.result:
  Test of new LIKE optimization
mysql-test/t/func_like.test:
  Test of new LIKE optimization

Docs/manual.texi:
  Fix typo, semi-redundancy.

(thanks to Yuri Dario <mc6530@mclink.it> for pointing this out)


Makefile.am:
  Added OS/2 subdirectory to source distribution
configure.in:
  Added OS/2 subdirectory to source distribution

Update of glibc patch from MySQL 4.0


Docs/glibc-2.2.5.patch:
  Update of patch from MySQL 4.0
Docs/manual.texi:
  ChangeLog
sql/item_strfunc.cc:
  Fix bug in CONCAT_WS()
sql/share/italian/errmsg.txt:
  Update of new error messages