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

Docs/manual.texi:
   - Fixed typo in Changelog

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

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

mysql-test/r/innodb.result:
  Fixed Innodb results after Heikki's last push
sql/ha_innodb.cc:
  Fixed type in Heikki's last push

Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE


BitKeeper/deleted/.del-CodingStyle~1ba7ff62d4cd0ea:
  Delete: vio/docs/CodingStyle
BitKeeper/deleted/.del-COPYING.dbug~ca0c017a4d7e8609:
  Delete: vio/docs/COPYING.dbug
BitKeeper/deleted/.del-COPYING.mysql~471498c82977cd3a:
  Delete: vio/docs/COPYING.mysql
BitKeeper/deleted/.del-README~947354991dc882f8:
  Delete: vio/docs/README
Docs/manual.texi:
  Changelog
acinclude.m4:
  Fixed searching after ssl directories.
client/Makefile.am:
  Moved openssl include to avoid problem with installed readline
include/Makefile.am:
  Install my_global.h
include/violite.h:
  Fixed that GRANT ... REQUIRE options are not forgot when doing new grant
libmysqld/examples/Makefile.am:
  Moved openssl include to avoid problem with installed readline
mysql-test/mysql-test-run.sh:
  Improved 'which' handling to give error if command is not found
mysys/mf_fn_ext.c:
  Changed fn_ext to point at first '.' after directory.
sql/Makefile.am:
  More comments
sql/lex.h:
  Added NONE as keyword
sql/log.cc:
  FLUSH LOGS removed numerical extension for all future update logs.
  Simple code cleanup
sql/mysqld.cc:
  Fixed the --help reports right values for --datadir and --bind-address
  --log-binary=a.b.c now properly strips of .b.c
  Removed option --skip-external-locking (not needed as this is automatic)
sql/repl_failsafe.cc:
  Moved some common THD initalization to store_globals()
sql/slave.cc:
  Moved openssl include to avoid problem with installed readline
sql/sql_acl.cc:
  Moved openssl include to avoid problem with installed readline
sql/sql_acl.h:
  Updated function prototypes
sql/sql_base.cc:
  Added comment
sql/sql_class.cc:
  Moved openssl include to avoid problem with installed readline.
  Changed THD::thd to make things work for main thread.
sql/sql_class.h:
  Fixed wrongly removed line (fixes compiler problem on MacOSX)
sql/sql_insert.cc:
  Moved openssl include to avoid problem with installed readline
sql/sql_lex.cc:
  Moved save_to_cache_query=0 to udf detection function to make sql_yacc.yy simpler
sql/sql_lex.h:
  Indentation cleanup
sql/sql_parse.cc:
  Moved openssl include to avoid problem with installed readline.
  Added THD argument to acl_reload()
sql/sql_repl.h:
  Made opt_bin_logname static
sql/sql_udf.cc:
  Fix that one can DROP UDF functions that was not loaded at startup
sql/sql_yacc.yy:
  made AND optional in REQUIRE
  Added REQUIRE NONE
  Fixed that old SSL options are not forgotten when doing new GRANT.
sql/udf_example.cc:
  Improved comments

  Fix a typo in last night's push


sql/ha_innodb.cc:
  Fix a typo in last night's push
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok:
  auto-union

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

Also copied note to 'know bugs and misfeatures' section.

into sinisa.nasamreza.org:/mnt/work/mysql-4.0


Docs/manual.texi:
  Auto merged

dict0dict.c	Put back code inadvertently removed in previous bk commit


innobase/dict/dict0dict.c:
  Put back code inadvertently removed in previous bk commit
innobase/include/dict0dict.h:
  Put back code inadvertently removed in previous bk commit

ha_innodb.cc	Remove gaps in auto-inc in multi-row inserts, more space for foreign key listings in SHOW TABLE STATUS, move resetting of active_trx to amore logical place
dict0dict.h	Remove gaps from auto-inc sequence if errors in multi-row insert
dict0dict.c	Remove gaps from auto-inc sequence if errors in multi-row insert


innobase/dict/dict0dict.c:
  Remove gaps from auto-inc sequence if errors in multi-row insert
innobase/include/dict0dict.h:
  Remove gaps from auto-inc sequence if errors in multi-row insert
sql/ha_innodb.cc:
  Remove gaps in auto-inc in multi-row inserts, more space for foreign key listings in SHOW TABLE STATUS, move resetting of active_trx to amore logical place
innobase/btr/btr0btr.c:
  Add more documentation about B-tree latching

sql/ha_innodb.cc:
  Test a new clone
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.0


Docs/manual.texi:
  Auto merged

into mysql.com:/space/my/mysql-4.0-build


Docs/manual.texi:
  Auto merged

   better documented
 - Added a note to manual.texi about using sysctl to tune Linux kernel
   parameters, corrected a wrong path name


Build-tools/Do-compile:
   - Removed some obsolete pieces of code (get rid of using rsh and rcp)
   - Added some code comments
   - Reworked help text to match the options available
   - Heavily reworked GetOptions, removed some obsolete ones and joined others
   - make_options and config_options can now be given multiple times
   - simplified code that added configure options dependent on given options
Docs/manual.texi:
   - Corrected location of boot.local init script on SuSE Linux
   - Add a note about using sysctl and sysctl.conf for changing kernel
     parameters

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

Docs/manual.texi:
  Forgot to add an entry into a manual

expansion of the wildcards

into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_select.cc:
  Auto merged

into mashka.mysql.fi:/home/my/mysql-4.0


Docs/manual.texi:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

Docs/manual.texi:
  SCCS merged

(Fixing of problem with ALTER TABLE on BDB tables)


mysql-test/r/distinct.result:
  Fixed results after bug fix
sql/mysql_priv.h:
  Split close_thread_tables() into two functions.
  (Needed for bug fix from 4.0)
sql/sql_base.cc:
  Split close_thread_tables() into two functions.
  (Needed for bug fix from 4.0)

Better fix for ALTER TABLE on BDB tables
(Both of the above fixes are already in 4.0)


Docs/manual.texi:
  Changelog
sql/item_cmpfunc.cc:
  Check if AND/OR expression can be NULL
sql/sql_table.cc:
  Better fix for ALTER TABLE on BDB tables

Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged