Merge lp:~linuxjedi/drizzle/trunk-bug-700099 into lp:drizzle/7.0

[Andrew Hutchings]

1. InnoDB Linux native AIO support in pandora (also a section in docs)
2. Fix InnoDB trinary option which were breaking on uint16_t -> uint32_t casting
3. Set the default InnoDB autoextend-increment the same as MySQL 5.5

[Monty Taylor (mordred)]

Thanks for the catch!

review: Approve

=== modified file 'drizzled/include.am'
--- drizzled/include.am	2011-01-06 16:43:31 +0000
+++ drizzled/include.am	2011-01-08 16:04:52 +0000
@@ -494,6 +494,7 @@
 				$(LTLIBPROTOBUF) \
 				$(LIBTBB) \
 				$(BOOST_LIBS) \
+                                $(LTLIBAIO) \
 				$(GCOV_LIBS) 
 
 drizzled_drizzled_DEPENDENCIES= \

=== added file 'm4/pandora_have_libaio.m4'
--- m4/pandora_have_libaio.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_have_libaio.m4	2011-01-08 16:04:52 +0000
@@ -0,0 +1,56 @@
+dnl  Copyright (C) 2011 Andrew Hutchings
+dnl This file is free software; Sun Microsystems, Inc.
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+#--------------------------------------------------------------------
+# Check for libaio
+#--------------------------------------------------------------------
+
+
+AC_DEFUN([_PANDORA_SEARCH_LIBAIO],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  AC_CHECK_HEADERS(libaio.h)
+  AC_LIB_HAVE_LINKFLAGS(aio,,
+  [
+    #include <libaio.h>
+  ],
+  [
+    int aio_cmd= IO_CMD_PREAD;
+  ])
+
+  AM_CONDITIONAL(HAVE_LIBAIO, [test "x${ac_cv_libaio}" = "xyes"])
+
+  AS_IF([test "x${ac_cv_libaio}" = "xyes"],[
+    AC_DEFINE([LINUX_NATIVE_AIO], [1], [Enabel libaio support in InnoDB])
+  ])
+])
+
+AC_DEFUN([_PANDORA_HAVE_LIBAIO],[
+
+  AC_ARG_ENABLE([libaio],
+    [AS_HELP_STRING([--disable-libaio],
+      [Build with libaio support @<:@default=on@:>@])],
+    [ac_enable_libaio="$enableval"],
+    [ac_enable_libaio="yes"])
+
+  _PANDORA_SEARCH_LIBAIO
+])
+
+
+AC_DEFUN([PANDORA_HAVE_LIBAIO],[
+  AC_REQUIRE([_PANDORA_HAVE_LIBAIO])
+])
+
+AC_DEFUN([_PANDORA_REQUIRE_LIBAIO],[
+  ac_enable_libaio="yes"
+  _PANDORA_SEARCH_LIBAIO
+  AS_IF([test "x$ac_cv_header_libaio_h" = "xno"],[
+    AC_MSG_ERROR([Couldn't find libaio.h. On Debian this can be found in libaio-dev. On Redhat this can be found in libaio-devel.])
+  ])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBAIO],[
+  AC_REQUIRE([_PANDORA_REQUIRE_LIBAIO])
+])

=== modified file 'plugin/innobase/docs/index.rst'
--- plugin/innobase/docs/index.rst	2010-11-03 03:49:08 +0000
+++ plugin/innobase/docs/index.rst	2011-01-08 16:04:52 +0000
@@ -22,6 +22,17 @@
  * AUTO_INCREMENT behaves the standard way (as in MyISAM)
  * Supports four byte UTF-8 with the same index size
 
+AIO support
+-----------
+
+InnoDB supports Linux native AIO when compiled on platforms that have the
+libaio development files installed (typically a package called libaio-dev or
+libaio-devel).  For more information on the advantages of this please see
+http://blogs.innodb.com/wp/2010/04/innodb-performance-aio-linux/
+
+To confirm that Linux native AIO is enabled execute this command:
+"show global variables like 'innodb_use_native_aio';"
+
 Compatibility with MySQL
 ------------------------
 

=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2011-01-02 23:51:43 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2011-01-08 16:04:52 +0000
@@ -202,7 +202,7 @@
 static purge_batch_constraint innodb_purge_batch_size;
 typedef constrained_check<uint32_t, 1, 0> purge_threads_constraint;
 static purge_threads_constraint innodb_n_purge_threads;
-typedef constrained_check<uint16_t, 2, 0> trinary_constraint;
+typedef constrained_check<uint32_t, 2, 0> trinary_constraint;
 static trinary_constraint innodb_flush_log_at_trx_commit;
 typedef constrained_check<unsigned int, 99, 0> max_dirty_pages_constraint;
 static max_dirty_pages_constraint innodb_max_dirty_pages_pct;
@@ -251,7 +251,7 @@
 /* Below we have boolean-valued start-up parameters, and their default
 values */
 
-typedef constrained_check<uint16_t, 2, 0> trinary_constraint;
+typedef constrained_check<uint32_t, 2, 0> trinary_constraint;
 static trinary_constraint innobase_fast_shutdown;
 
 /* "innobase_file_format_check" decides whether we would continue
@@ -2426,7 +2426,7 @@
   context.registerVariable(new sys_var_constrained_value<uint32_t>("purge_threads",
                                                                    innodb_n_purge_threads,
                                                                    purge_threads_update));
-  context.registerVariable(new sys_var_constrained_value<uint16_t>("fast_shutdown", innobase_fast_shutdown));
+  context.registerVariable(new sys_var_constrained_value<uint32_t>("fast_shutdown", innobase_fast_shutdown));
   context.registerVariable(new sys_var_std_string("file_format",
                                                   innobase_file_format_name,
                                                   innodb_file_format_name_validate));
@@ -2438,7 +2438,7 @@
                                                   innodb_file_format_max_validate));
   context.registerVariable(new sys_var_constrained_value_readonly<size_t>("buffer_pool_size", innobase_buffer_pool_size));
   context.registerVariable(new sys_var_constrained_value_readonly<int64_t>("log_file_size", innobase_log_file_size));
-  context.registerVariable(new sys_var_constrained_value_readonly<uint16_t>("flush_log_at_trx_commit",
+  context.registerVariable(new sys_var_constrained_value_readonly<uint32_t>("flush_log_at_trx_commit",
                                                   innodb_flush_log_at_trx_commit));
   context.registerVariable(new sys_var_constrained_value_readonly<unsigned int>("max_dirty_pages_pct",
                                                   innodb_max_dirty_pages_pct));
@@ -9298,7 +9298,7 @@
           po::value<additional_mem_pool_constraint>(&innobase_additional_mem_pool_size)->default_value(8*1024*1024L),
           "Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures.");
   context("autoextend-increment",
-          po::value<autoextend_constraint>(&innodb_auto_extend_increment)->default_value(8L),
+          po::value<autoextend_constraint>(&innodb_auto_extend_increment)->default_value(64L),
           "Data file autoextend increment in megabytes");
   context("buffer-pool-size",
           po::value<buffer_pool_constraint>(&innobase_buffer_pool_size)->default_value(128*1024*1024L),

=== modified file 'plugin/innobase/os/os0file.cc'
--- plugin/innobase/os/os0file.cc	2010-12-27 18:39:11 +0000
+++ plugin/innobase/os/os0file.cc	2011-01-08 16:04:52 +0000
@@ -3215,7 +3215,7 @@
 #ifdef WIN_ASYNC_IO
 	OVERLAPPED*	over;
 #elif defined(LINUX_NATIVE_AIO)
-	struct io_event*	io_event = NULL;
+	struct io_event*	aio_event = NULL;
 #endif
 	ut_a(n > 0);
 	ut_a(n_segments > 0);
@@ -3250,7 +3250,7 @@
 	/* Initialize the io_context array. One io_context
 	per segment in the array. */
 
-	array->aio_ctx = ut_malloc(n_segments *
+	array->aio_ctx = (io_context**) ut_malloc(n_segments *
 				   sizeof(*array->aio_ctx));
 	for (i = 0; i < n_segments; ++i) {
 		if (!os_aio_linux_create_io_ctx(n/n_segments,
@@ -3266,9 +3266,9 @@
 	}
 
 	/* Initialize the event array. One event per slot. */
-	io_event = ut_malloc(n * sizeof(*io_event));
-	memset(io_event, 0x0, sizeof(*io_event) * n);
-	array->aio_events = io_event;
+	aio_event = (io_event*) ut_malloc(n * sizeof(io_event));
+	memset(aio_event, 0x0, sizeof(io_event) * n);
+	array->aio_events = aio_event;
 
 skip_native_aio:
 #endif /* LINUX_NATIVE_AIO */

=== modified file 'plugin/innobase/plugin.ac'
--- plugin/innobase/plugin.ac	2010-12-18 04:43:40 +0000
+++ plugin/innobase/plugin.ac	2011-01-08 16:04:52 +0000
@@ -16,6 +16,7 @@
 
 AC_DEFUN([AC_INNODB_ACTIONS],[
   PANDORA_REQUIRE_FLEX
+  PANDORA_HAVE_LIBAIO
 
   AC_REQUIRE([AC_FUNC_MMAP])
 

=== modified file 'plugin/innobase/plugin.am'
--- plugin/innobase/plugin.am	2010-12-27 18:39:11 +0000
+++ plugin/innobase/plugin.am	2011-01-08 16:04:52 +0000
@@ -226,6 +226,7 @@
 endif
 
 plugin_innobase_libinnobase_la_CXXFLAGS=${AM_CXXFLAGS} ${INNOBASE_SKIP_WARNINGS} -I${top_builddir}/plugin/innobase/include -I$(top_srcdir)/plugin/innobase/include -DBUILD_DRIZZLE
+plugin_innobase_libinnobase_la_LDDADD= ${LTLIBAIO}
 plugin_innobase_libinnobase_la_SOURCES= \
                                         plugin/innobase/btr/btr0btr.cc \
                                         plugin/innobase/btr/btr0cur.cc \