mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
merge with 3.23
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5: Auto merged Docs/manual.texi: Auto merged client/client_priv.h: Auto merged extra/resolveip.c: Auto merged innobase/btr/btr0sea.c: Auto merged innobase/os/os0file.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/srv/srv0srv.c: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged mysys/my_bitmap.c: Auto merged sql/ha_innobase.cc: Auto merged sql/ha_innobase.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_do.cc: Auto merged sql/sql_select.cc: Auto merged client/mysqldump.c: Use local version in 4.0 configure.in: Use 4.0 code
This commit is contained in:
commit
62c4fa399e
16 changed files with 155 additions and 18 deletions
|
|
@ -2427,7 +2427,19 @@ loop:
|
|||
|
||||
background_loop:
|
||||
/* In this loop we run background operations when the server
|
||||
is quiet */
|
||||
is quiet and we also come here about once in 10 seconds */
|
||||
|
||||
srv_main_thread_op_info = "flushing buffer pool pages";
|
||||
|
||||
/* Flush a few oldest pages to make the checkpoint younger */
|
||||
|
||||
n_pages_flushed = buf_flush_batch(BUF_FLUSH_LIST, 10, ut_dulint_max);
|
||||
|
||||
srv_main_thread_op_info = "making checkpoint";
|
||||
|
||||
/* Make a new checkpoint about once in 10 seconds */
|
||||
|
||||
log_checkpoint(TRUE, FALSE);
|
||||
|
||||
srv_main_thread_op_info = (char *) "reserving kernel mutex";
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue