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:
  Fix typo, semi-redundancy.

into work.mysql.com:/home/akishkin/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union

BUILD/compile-pentium-gcov:
  Remove optimization, add innodb and bdb
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.de.texi:
  Copied new section to German manual (to be translated).
Docs/manual.texi:
  Re-merged Monty's additions with Arjen's original fixups.

Docs/manual.texi:
  Small changes regarind user resources
client/mysqlbinlog.cc:
  Applied patch to support --database
mysql-test/r/func_isnull.result:
  New test results
mysql-test/r/join.result:
  New test results
mysql-test/r/show_check.result:
  New test results
mysql-test/r/type_datetime.result:
  New test results
mysql-test/r/type_decimal.result:
  New test results
mysql-test/r/type_float.result:
  New test results
mysys/my_gethostbyname.c:
  Fixed type on last push
mysys/my_pthread.c:
  Fixed type on last push
sql/sql_select.cc:
  Fixed bug in LIMIT handling

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mysql_fix_extensions.sh:
  Delete: scripts/mysql_fix_extensions.sh
Build-tools/Do-rpm:
  Auto merged
Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/charset.c:
  Auto merged
mysys/default.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/raid.cc:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/Makefile.am:
  Auto merged

Changed some status variable names
Fix bug in GRANT ... PASSWORD string


Docs/manual.texi:
  Update of variable names
include/my_net.h:
  New my_gethostbyname_r() handling
include/my_pthread.h:
  New my_gethostbyname_r() handling
libmysql/Makefile.shared:
  New my_gethostbyname_r() handling
libmysql/libmysql.c:
  New my_gethostbyname_r() handling
mysys/Makefile.am:
  New my_gethostbyname_r() handling
mysys/my_pthread.c:
  New my_gethostbyname_r() handling
mysys/my_thr_init.c:
  New my_gethostbyname_r() handling
sql/hostname.cc:
  New my_gethostbyname_r() handling
sql/mini_client.cc:
  New my_gethostbyname_r() handling
sql/mysqld.cc:
  change some status variable names
sql/sql_acl.cc:
  Fix bug in GRANT ... PASSWORD string

sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Update of new GRANT options
libmysql/manager.c:
  Use new my_gethostbyname_r() functions
mysql-test/r/select_found.result:
  new test case
mysql-test/t/select_found.test:
  new test case
sql/mysqld.cc:
  Change names of some status variables

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

Various cleanups in News 4.0.2 section.

into teton.kitebird.com:/home/paul/mysql-4.0

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

Docs/manual.texi:
  Put back text that Sinisa wiped out in a resolve.

Docs/manual.texi:
  SCCS merged

mysys/my_getopt.c:
  Changed GET_STRALC to GET_STR_ALLOC
  Added error checking for my_strdup()

libmysqld/lib_sql.cc:
  Fix to make the embedded server compile with the new USER_REOSURCEs.
sql/sql_acl.cc:
  Fixed wrong test in password checking.
sql/sql_cache.cc:
  Fixed wrong cast
sql/sql_parse.cc:
  Cleanup

Docs/manual.texi:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Docs/manual.texi:
  Updated information about --temp-pool
libmysql/libmysql.c:
  Call my_end() at exit
libmysqld/lib_sql.cc:
  Call my_end() at exit
sql/mysqld.cc:
  Removed some long comments (should be in manual).

mysql_copyright to replace it


client/mysqlcheck.c:
  Reformatted license statement in usage output to enable mysql_copyright
  to replace it

sql/sql_parse.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

Read a manual for more detail

Made detection of GNU tar a bit more flexible.
Only use /usr/local/mysql-glibc if it actually exists


Build-tools/Do-linux-build:
  Only use the "--with-other-libc" parameter, if another libc actually
  exists at this location
Makefile.am:
  Removed hard-coded tar binary name
configure.in:
  Added check for GNU tar with various names
sql/sql_yacc.yy:
  Added semicolons to several expressions to make bison 1.31 and above
  happy when used in Yacc compatibility mode. From the bison NEWS:
  
    "Bison has always permitted actions such as { $$ = $1 }: it adds the
    ending semicolon.  Now if in Yacc compatibility mode, the semicolon
    is no longer output: one has to write { $$ = $1; }."
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into hegel.local:/home/miguel/dev/mysql-4.0

Docs/Manual_style_guidelines.txt:
  Add item on operators.
Docs/manual.texi:
  Style fixup to changelog.

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


Docs/manual.texi:
  Auto merged

myisam/myisamchk.c:
  Fixed a type.
mysys/my_getopt.c:
  Made GET_STRALC to work like x_free() when doing a freeing.
  Fixed a bug in my_print_variables() when printing a ulonglong value.
sql/mysqld.cc:
  Fixed some wrongly alloced/freed variables and removed some
  unneccessary code.