mysys/my_aes.c:
  Small addition which used only in case of special define which weakens AES key length for some 
  Export limitations

Docs/manual.texi:
  Return to normal version

Docs/manual.texi:
  t

   "make dist" succeed again.


Makefile.am:
  Removed MIRRORS from source distribution

failures when building the embedded server.


libmysqld/Makefile.am:
   - Added missing file sql_olap.cc to make building the embedded server
     possible again

  merge.test - it was missed in the previous commit :(
manual.texi:
  fixed bad auto-merge of OLAP manual 
Docs/Makefile.am:
  removed ../MIRROR target (mirror list is no longer in the manual)


Docs/Makefile.am:
  removed ../MIRROR target (mirror list is no longer in the manual)
Docs/manual.texi:
  fixed bad auto-merge of OLAP manual
mysql-test/t/merge.test:
  merge.test - it was missed in the previous commit :(

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


Docs/manual.texi:
  Auto merged

HA_AUTO_PART_KEY support for handler parent class


Docs/manual.texi:
  AUTO_INCREMENT support for MERGE
mysql-test/r/merge.result:
  AUTO_INCREMENT support for MERGE
sql/ha_myisammrg.cc:
  AUTO_INCREMENT support for MERGE
sql/ha_myisammrg.h:
  AUTO_INCREMENT support for MERGE
sql/handler.cc:
  default handler::update_auto_increment now supports HA_AUTO_PART_KEY

Docs/manual.texi:
  Merge	One more merge of docs due to LOG function addition. I' not sure if it is good enough so will ask Arjen to check after push

One more resolving because of pending log functions changes. Not sure if the manual is merged correctly again. Will ask arjen to check as soon as LOG changes will be pushed 


sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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

Removed certification@mysql.com address from manual. Just keep website ref.

Noted version # for 'prompt' addition to cmdline client.

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Automerge (Arjen please check)

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


Docs/manual.texi:
  Auto merged

  Added note about new version numbers.
configure.in:
  Updated version number.

Sorry, bitkeeper keeps messing up.


configure.in:
  Updated version number.
Docs/manual.texi:
  Added note about new version numbers.

C++ comments cleanup


sql/stacktrace.c:
  C++ comments cleanup
sql/structs.h:
  C++ comments cleanup
sql/ha_myisam.h:
  C++ comments cleanup
include/config-os2.h:
  C++ comments cleanup
include/sslopt-case.h:
  C++ comments cleanup
mysys/mf_tempfile.c:
  C++ comments cleanup
sql/mysql_priv.h:
  C++ comments cleanup
sql/slave.h:
  C++ comments cleanup
sql/time.cc:
  C++ comments cleanup
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Manual changes to doccument new functions and function changes
mysql-test/r/func_math.result:
  Extend tests for LOG family functions
mysql-test/t/func_math.test:
  Extend tests for LOG family functions
sql/gen_lex_hash.cc:
  Lex hash changes
sql/item_create.cc:
  Rename old log function to ln
sql/item_create.h:
  More log functions
sql/item_func.cc:
  Implementation of new log function behavior
sql/item_func.h:
  Class definition for new functions
sql/lex.h:
  Function names
sql/sql_yacc.yy:
  Symbols for new LOG function
tests/function.res:
  One more test result change
tests/function.tst:
  One more test change
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Added changelog entry for Jani's pager fix in mysql client.

in get_options (thanks to Sinisa for fixing this)


sql/mysqld.cc:
  Fix a core dump that occured on AIX and Solaris in get_options

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


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_lex.h:
  Auto merged

Will do a push when it starts working ..

mysqld.cc	h
mysqld.cc	small fix for --bind-address


sql/mysqld.cc:
  ?
  h
  small fix for --bind-address

Docs/manual.texi:
  Auto merged

- fixed compile option in mysql.spec


Docs/manual.ja.texi:
  Fixed typo myslqadmin -> mysqladmin
Docs/manual.texi:
  Fixed typo myslqadmin -> mysqladmin
support-files/mysql.spec.sh:
  Fixed compile option --with-ssl -> --with-openssl

client/mysql.cc:
  Fixed a bug in pager