summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-08-26 15:19:46 +0200
committerunknown <serg@serg.mylan>2004-08-26 15:19:46 +0200
commite8d41a5b1bf0c559c5c3acab469eaa6ff56accfb (patch)
tree9299076637e9019c66560b2d68fe6b4bc6456487 /innobase
parent42771f9877c17050a230cdaf8a26afc5d077a712 (diff)
parentad1f3bb17d5a8117ff9feb987c04a52f22394189 (diff)
downloadmariadb-git-e8d41a5b1bf0c559c5c3acab469eaa6ff56accfb.tar.gz
merged
BitKeeper/etc/logging_ok: auto-union VC++Files/sql/mysqld.dsp: Auto merged client/mysql.cc: Auto merged client/mysqladmin.c: Auto merged BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlmanager-pwgen.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged extra/my_print_defaults.c: Auto merged extra/perror.c: Auto merged extra/resolve_stack_dump.c: Auto merged extra/resolveip.c: Auto merged include/my_getopt.h: Auto merged innobase/buf/buf0rea.c: Auto merged isam/isamchk.c: Auto merged isam/pack_isam.c: Auto merged libmysqld/Makefile.am: Auto merged myisam/mi_test1.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/gen_lex_hash.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged tools/mysqlmanager.c: Auto merged
Diffstat (limited to 'innobase')
-rw-r--r--innobase/buf/buf0rea.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/buf/buf0rea.c b/innobase/buf/buf0rea.c
index 71e885ff439..11107d777c8 100644
--- a/innobase/buf/buf0rea.c
+++ b/innobase/buf/buf0rea.c
@@ -629,6 +629,8 @@ buf_read_ibuf_merge_pages(
}
}
+ os_aio_simulated_wake_handler_threads();
+
/* Flush pages from the end of the LRU list if necessary */
buf_flush_free_margin();