Merge with 3.23.51

Fixed wrong usage of sprintf() in ha_innodb.cc

1 files changed, 16 insertions, 2 deletions

diff --git a/innobase/include/os0file.h b/innobase/include/os0file.h
index 01fa12955ff..b7911c5014a 100644
--- a/innobase/include/os0file.h
+++ b/innobase/include/os0file.h
@@ -16,6 +16,7 @@ Created 10/21/1995 Heikki Tuuri
 os_file_write */
 extern ibool	os_do_not_call_flush_at_each_write;
 extern ibool	os_has_said_disk_full;
+extern ibool	os_aio_print_debug;
 
 #ifdef __WIN__
 
@@ -33,6 +34,8 @@ extern ibool	os_has_said_disk_full;
 typedef int	os_file_t;
 #endif
 
+extern ulint	os_innodb_umask;
+
 /* If this flag is TRUE, then we will use the native aio of the
 OS (provided we compiled Innobase with it in), otherwise we will
 use simulated aio we build below with threads */
@@ -309,6 +312,15 @@ Wakes up simulated aio i/o-handler threads if they have something to do. */
 void
 os_aio_simulated_wake_handler_threads(void);
 /*=======================================*/
+/**************************************************************************
+This function can be called if one wants to post a batch of reads and
+prefers an i/o-handler thread to handle them all at once later. You must
+call os_aio_simulated_wake_handler_threads later to ensure the threads
+are not left sleeping! */
+
+void
+os_aio_simulated_put_read_threads_to_sleep(void);
+/*============================================*/
 
 #ifdef WIN_ASYNC_IO
 /**************************************************************************
@@ -391,8 +403,10 @@ os_aio_validate(void);
 Prints info of the aio arrays. */
 
 void
-os_aio_print(void);
-/*==============*/
+os_aio_print(
+/*=========*/
+	char*	buf,	/* in/out: buffer where to print */
+	char*	buf_end);/* in: buffer end */
 /**************************************************************************
 Checks that all slots in the system have been freed, that is, there are
 no pending io operations. */