Build-tools/Do-compile:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
sql/ha_innodb.h:
  Auto merged
Docs/manual.texi:
  merge
sql/ha_innodb.cc:
  merge
sql/mysqld.cc:
  merge

mysys/thr_alarm.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
Docs/manual.texi:
  merge (Removed bug fix comments for not relesed version)

Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.


Docs/manual.texi:
  Changelog
client/mysqlbinlog.cc:
  Handle empty binlogfiles gracefully
client/mysqltest.c:
  Do a sleep after 'sync_with_master'
  Cleaned up sleep() handling.
  Free all memory on exit
configure.in:
  Fix for Mac OS 10.2
include/my_sys.h:
  Added my_strdup_with_length()
innobase/btr/btr0cur.c:
  Fixed wrong printf()
libmysql/libmysql.c:
  Added DBUG_PRINT statements.
  Assume that mysql_...send() functions has correct query length.
mysql-test/mysql-test-run.sh:
  Properly remove log files before starting new tests.
mysql-test/r/grant.result:
  Update for new test results
mysql-test/r/innodb.result:
  Update for new test results
mysql-test/r/myisam.result:
  Update for new test results
mysql-test/r/rpl_log.result:
  Update for new test results
mysql-test/r/rpl_rotate_logs.result:
  Update for new test results
mysql-test/r/variables.result:
  Update for new test results
mysql-test/t/grant.test:
  Test that GRANT doesn't delete SSL options
mysql-test/t/myisam.test:
  Test long key usage
mysql-test/t/rpl_log.test:
  Disable 'show new master'
mysql-test/t/rpl_mystery22.test:
  Longer sleep for more safety.
mysql-test/t/rpl_rotate_logs.test:
  More comments
mysys/my_malloc.c:
  Added my_strdup_with_length()
mysys/safemalloc.c:
  Added my_strdup_with_length()
mysys/thr_alarm.c:
  Fix of alarms for windows.
sql/ha_innodb.cc:
  Change innobase_flush_log_at_trx_commit to uint
mysql-test/r/rpl_redirect.result:
  Updated test results
mysql-test/t/rpl_redirect.test:
  Added more tests to improve code coverage.
sql/ha_innodb.h:
  Change innobase_flush_log_at_trx_commit to uint
sql/item_func.cc:
  Return GLOBAL and SESSION as part of column names
sql/log.cc:
  Only write STOP events when server goes down.
sql/log_event.cc:
  Don't rotate logs if we read a rotate log entry from the master.
sql/log_event.h:
  Change ident_len to uint (more efficient)
sql/mysqld.cc:
  Change innobase_flush_log_at_trx_commit to uint
sql/net_serv.cc:
  More debug output
sql/repl_failsafe.cc:
  More DEBUG
  Search until we find next position in binary log (and not only =)
sql/slave.cc:
  More DBUG & comments
  Don't rotate the binary log on master flush logs
sql/slave.h:
  indentation change
sql/sql_acl.cc:
  Test that GRANT doesn't delete SSL options
sql/sql_parse.cc:
  Disable show_new_master.
sql/sql_repl.cc:
  Chamger show_binlog_events() to use my_error()
sql/sql_table.cc:
  Fixed check for too long keys in MyISAM
sql/sql_udf.cc:
  Fix udf handling

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

myisam/mi_create.c:
  check for MI_MAX_KEY_LENGTH in mi_create()
sql/sql_table.cc:
  fix obvious typo

manual.texi	formatting fixups


Docs/manual.texi:
  British-ise some -ize words

  Cleanup after last push


sql/ha_innobase.cc:
  Cleanup after last push

  update help innobase_flush_log_at_trx_commitcan have vals 0, 1, 2 
ha_innobase.h, ha_innobase.cc:
  make innobase_flush_log_at_trx_commit a long, like other params


sql/ha_innobase.cc:
  make innobase_flush_log_at_trx_commit a long, like other params
sql/ha_innobase.h:
  make innobase_flush_log_at_trx_commit a long, like other params
sql/mysqld.cc:
  update help innobase_flush_log_at_trx_commitcan have vals 0, 1, 2

  Fix a typo: should be buf_page_print


innobase/os/os0file.c:
  Fix a typo: should be buf_page_print

  innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52


sql/ha_innobase.h:
  innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52
sql/ha_innobase.cc:
  innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52

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

  Remove an assertion in trx0undo.c which could erroneously fail when we ran out of tablespace


innobase/trx/trx0undo.c:
  Remove an assertion in trx0undo.c which could erroneously fail when we ran out of tablespace

  Increase max latch wait time to 600 seconds before we assert


innobase/sync/sync0arr.c:
  Increase max latch wait time to 600 seconds before we assert

  Remove long latch hold which happened if we scanned long an index without finding any record visible to the current consistent read


innobase/btr/btr0cur.c:
  Remove long latch hold which happened if we scanned long an index without finding any record visible to the current consistent read

  Add diagnostics to track why a semaphore creation failed on Windows ME


innobase/os/os0sync.c:
  Add diagnostics to track why a semaphore creation failed on Windows ME

  The option (= default) innodb_fast_shutdown did not always make the shutdown quickly, fix that


innobase/srv/srv0srv.c:
  The option (= default) innodb_fast_shutdown did not always make the shutdown quickly, fix that

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