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.

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

manual.texi	formatting fixups

  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

  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

  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

  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

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

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

  Fix a typo in last night's push

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

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

dict0dict.c	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

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