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

Docs/manual.texi:
  SCCS merged

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).

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

Read a manual for more detail

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.

- Fixed some bugs, wrongly freed pointers, in some clients.
- Removed unneccessary code.
- Fixed some other minor bugs and added some options into
  variables category, which had accidently been left out earlier.


client/mysql.cc:
  Fixed some wrong freed pointers. Removed unneccessary code.
  Changed some types from GET_STR to GET_STRALC.
client/mysqladmin.c:
  Fixed some wrong freed pointers. Removed unneccessary code.
  Changed some types from GET_STR to GET_STRALC.
client/mysqlcheck.c:
  Fixed some wrong freed pointers. Removed unneccessary code.
  Changed some types from GET_STR to GET_STRALC.
client/mysqldump.c:
  Fixed some wrong freed pointers. Removed unneccessary code.
  Changed some types from GET_STR to GET_STRALC.
client/mysqlimport.c:
  Removed unneccessary code.
  Fixed a bug in option --ignore-lines
client/mysqlshow.c:
  Removed unneccessary code.
include/my_getopt.h:
  Added new type, GET_STRALC. The name stands for GET STRING ALLOC,
  which means that the struct member value and u_max_value are
  strings that must be alloced and freed when used.
  The normal GET_STR works similarly otherwise, except that it's
  arguments are just pointers to strings, not alloced ones.
mysys/my_getopt.c:
  Added support for GET_STRALC

manual.texi	operands, not arguments.


Docs/manual.texi:
  Operators are operators, not functions, so they take
  operands, not arguments.

manual.texi	behavior to return NULL, not zero, if either operand is NULL)


Docs/manual.texi:
  Update description of logical AND. (In 3.23.9, it changed
  behavior to return NULL, not zero, if either operand is NULL)

Docs/manual.texi:
  Change note mods, 3.23.51.

Docs/manual.texi:
  Clarify meaning of SET TRANSACTION.

Docs/manual.texi:
  Add --quote-names to mysqldump option list.

Docs/manual.texi:
  DATE_FORMAT() %U, %u, %V, %u specifiers produce two digits.

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


BitKeeper/etc/logging_ok:
  auto-union

mysql-test/t/func_encrypt-master.opt:
  added --loose to --des-key-file for mysql-test not to fail w/o ssl
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/sql_yacc.yy:
  Fixed typo

mysys/my_getopt.c:
  Added support for --loose-set-variable
sql/mysqld.cc:
  Fixed a bug when compiling with innodb and/or bdb.

into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0

- Added special option/variable prefix '--loose-' to my_getopt.c


client/mysql.cc:
  Fixed some variable types.
client/mysqladmin.c:
  Fixed some variable types.
client/mysqlcheck.c:
  Fixed some variable types.
client/mysqldump.c:
  Fixed some variable types.
client/mysqlimport.c:
  Fixed some variable types.
client/mysqlshow.c:
  Fixed some variable types.
myisam/myisamchk.c:
  Fixed some variable types.
mysys/my_getopt.c:
  Fixed a bug in noticing whether argument was allowed to option (variable).
  Added support for prefix --loose-option-name
  This will work with options and variables, but not with --set-variable (!)
  --set-variable is depricated and --variable-name=value should be used
  instead. When used, my_getopt will not return error if option/variable
  was not found, but print a warning, do a no-op and continue.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

(--prompt code contributed by Harrison Fisk.)
Made mysql subsection title clear.
Little style cleanups.

BitKeeper/etc/logging_ok:
  auto-union

Docs/manual.texi:
  Update information about libstdc++
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/Manual_style_guidelines.txt:
  Added "full-text" to style doc. Was previously decided, not documented.

manual.texi	Change note mods, 4.0.2.


Docs/manual.texi:
  Clean up some MERGE uses.

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