Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1)


innobase/trx/trx0sys.c:
  Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1)
innobase/srv/srv0start.c:
  Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1)

   MySQL-classic did not pass the test suite rpl_rotate_logs.test anymore because a recent 1.1424.2.17 cset introduced an opt_using_transactions
    which prevented binlogs to be rotated if transactions were not enabled. Fix for this. This bug did not affect releases.


sql/log.cc:
  MySQL-classic did not pass the test suite rpl_rotate_logs.test anymore because a recent 1.1424.2.17 cset introduced an opt_using_transactions
  which prevented binlogs to be rotated if transactions were not enabled. Fix for this. This bug did not affect releases.

  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value


include/my_base.h:
  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value

  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value


sql/opt_sum.cc:
  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value
sql/sql_select.cc:
  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value

   can be used to build a compatibility package that includes the shared
   libraries of MySQL 3.23.xx and MySQL 4.0.xx for backwards compatibility
   with dynamically linked applications. It simply repackages the two
   MySQL-shared RPMs, so these need to be created or downloaded separately.


support-files/Makefile.am:
   - added MySQL-shared-compat.spec(.sh) to the distribution

into narttu.mysql.fi:/my/mysql-4.0

sql/time.cc:
  Removed not used code
  Fixed that reading a DATE string of 000000 is interpreted as 0000-00-00 instead of 2000-00-00

  Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index


innobase/buf/buf0flu.c:
  Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index
innobase/buf/buf0lru.c:
  Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index

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


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

into hundin.mysql.fi:/home/heikki/mysql-4.0

  Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user


innobase/srv/srv0srv.c:
  Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user
innobase/include/dict0dict.h:
  Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user
innobase/dict/dict0dict.c:
  Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user
innobase/row/row0ins.c:
  Let SHOW INNODB STATUS print detailed info of the latest unique key violation, note that REPLACE and INSERT IGNORE mask the error from the user

into mysql.com:/home/pz/mysql/mysql-4.0-root

sql/mysql_priv.h:
  Add ifdef to allow compilation without Innodb

  Print progress information if at startup InnoDB creates and writes bigger than 100 MB data file or log file


innobase/os/os0file.c:
  Print progress information if at startup InnoDB creates and writes bigger than 100 MB data file or log file

into mysql.com:/home/pz/mysql/mysql-4.0

  Do not let the main thread sleep the 1 second if we had to do a bug pool flush batch trying to establish srv_max_buf_pool_modified_pct


innobase/srv/srv0srv.c:
  Do not let the main thread sleep the 1 second if we had to do a bug pool flush batch trying to establish srv_max_buf_pool_modified_pct

    of dirty pages in the buffer pool (can be changed online)


sql/mysql_priv.h:
  Added innodb_max_dirty_pages_pct parameter to limit amount 
  of dirty pages in the buffer pool (can be changed online)
sql/mysqld.cc:
  Added new option
sql/set_var.cc:
  Added new variable handling

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

  Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker


innobase/srv/srv0srv.c:
  Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker

  Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker


innobase/srv/srv0srv.c:
  Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker
innobase/include/buf0buf.h:
  Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker
innobase/include/srv0srv.h:
  Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker
innobase/buf/buf0buf.c:
  Clean up the working of the main thread; add a tunable parameter srv_max_buf_pool_modified_pct which can be used to make the flush phase in shutdown quicker

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

   files into an already existing directory)

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

into narttu.mysql.fi:/my/mysql-4.0


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

mysql-test/r/innodb.result:
  Changed tests to make them repeatable.
mysql-test/t/innodb.test:
  Changed tests to make them repeatable.
sql/opt_sum.cc:
  Safety fix
sql/sql_base.cc:
  Safety assert

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

  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released


sql/log.cc:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
sql/handler.cc:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
sql/handler.h:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
sql/ha_innodb.cc:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
sql/ha_innodb.h:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
innobase/include/log0log.h:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
innobase/include/trx0trx.h:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
innobase/os/os0file.c:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
innobase/buf/buf0flu.c:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
innobase/trx/trx0trx.c:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
innobase/log/log0log.c:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
innobase/srv/srv0srv.c:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released
innobase/row/row0mysql.c:
  Eliminate the LOCK_log bottleneck in group commit in binlogging: flush InnoDB log files only after it has been released

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


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

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

   (several users reported crashes, even when not using RAID) (see bug #346)