Drizzle

Merge lp:~stewart/drizzle/embedded-innodb-configuration-doublewrite into lp:~drizzle-trunk/drizzle/development

  1. embedded-innodb-configuration-doublewrite
  2. Merge into development
Proposed by Stewart Smith
Status: Merged
Merged at revision: 1536
Proposed branch: lp:~stewart/drizzle/embedded-innodb-configuration-doublewrite
Merge into: lp:~drizzle-trunk/drizzle/development
Prerequisite: lp:~stewart/drizzle/embedded-innodb-configuration-datahome
Diff against target: 95 lines (+34/-0)
7 files modified
plugin/embedded_innodb/embedded_innodb_engine.cc (+16/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_disable.result (+6/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_enable.result (+6/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt (+1/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable.test (+2/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt (+1/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable.test (+2/-0)
To merge this branch: bzr merge lp:~stewart/drizzle/embedded-innodb-configuration-doublewrite
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Brian Aker Pending
Review via email: mp+24801@code.launchpad.net

Description of the change

support innodb_doublewrite configuration option in embedded_innodb

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) :
review: Approve
lp:~stewart/drizzle/embedded-innodb-configuration-doublewrite updated
1427. By Stewart Smith

Merged embedded-innodb-configuration-datahome into embedded-innodb-configuration-doublewrite.

1428. By Stewart Smith

Merged embedded-innodb-configuration-datahome into embedded-innodb-configuration-doublewrite.

1429. By Stewart Smith

merge trunk

1430. By Stewart Smith

Merged embedded-innodb-configuration-datahome into embedded-innodb-configuration-doublewrite.

1431. By Stewart Smith

Merged embedded-innodb-configuration-datahome into embedded-innodb-configuration-doublewrite.

1432. By Stewart Smith

Merged embedded-innodb-configuration-datahome into embedded-innodb-configuration-doublewrite.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.cc'
--- plugin/embedded_innodb/embedded_innodb_engine.cc 2010-05-17 13:06:50 +0000
+++ plugin/embedded_innodb/embedded_innodb_engine.cc 2010-05-17 13:06:51 +0000
@@ -2175,6 +2175,7 @@
21752175
2176static bool innobase_use_checksums= true;2176static bool innobase_use_checksums= true;
2177static char* innobase_data_home_dir = NULL;2177static char* innobase_data_home_dir = NULL;
2178static bool innobase_use_doublewrite= true;
2178static char default_innodb_data_file_path[]= "ibdata1:10M:autoextend";2179static char default_innodb_data_file_path[]= "ibdata1:10M:autoextend";
2179static char* innodb_data_file_path= NULL;2180static char* innodb_data_file_path= NULL;
21802181
@@ -2199,6 +2200,14 @@
2199 if (innodb_data_file_path == NULL)2200 if (innodb_data_file_path == NULL)
2200 innodb_data_file_path= default_innodb_data_file_path;2201 innodb_data_file_path= default_innodb_data_file_path;
22012202
2203 if (innobase_use_doublewrite)
2204 err= ib_cfg_set_bool_on("doublewrite");
2205 else
2206 err= ib_cfg_set_bool_off("doublewrite");
2207
2208 if (err != DB_SUCCESS)
2209 goto innodb_error;
2210
2202 err= ib_cfg_set_text("data_file_path", innodb_data_file_path);2211 err= ib_cfg_set_text("data_file_path", innodb_data_file_path);
2203 if (err != DB_SUCCESS)2212 if (err != DB_SUCCESS)
2204 goto innodb_error;2213 goto innodb_error;
@@ -2260,6 +2269,12 @@
2260 "The common part for InnoDB table spaces.",2269 "The common part for InnoDB table spaces.",
2261 NULL, NULL, NULL);2270 NULL, NULL, NULL);
22622271
2272static DRIZZLE_SYSVAR_BOOL(doublewrite, innobase_use_doublewrite,
2273 PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
2274 "Enable InnoDB doublewrite buffer (enabled by default). "
2275 "Disable with --skip-innodb-doublewrite.",
2276 NULL, NULL, true);
2277
2263static DRIZZLE_SYSVAR_STR(data_file_path, innodb_data_file_path,2278static DRIZZLE_SYSVAR_STR(data_file_path, innodb_data_file_path,
2264 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,2279 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
2265 "Path to individual files and their sizes.",2280 "Path to individual files and their sizes.",
@@ -2283,6 +2298,7 @@
2283static drizzle_sys_var* innobase_system_variables[]= {2298static drizzle_sys_var* innobase_system_variables[]= {
2284 DRIZZLE_SYSVAR(checksums),2299 DRIZZLE_SYSVAR(checksums),
2285 DRIZZLE_SYSVAR(data_home_dir),2300 DRIZZLE_SYSVAR(data_home_dir),
2301 DRIZZLE_SYSVAR(doublewrite),
2286 DRIZZLE_SYSVAR(data_file_path),2302 DRIZZLE_SYSVAR(data_file_path),
2287 DRIZZLE_SYSVAR(lock_wait_timeout),2303 DRIZZLE_SYSVAR(lock_wait_timeout),
2288 DRIZZLE_SYSVAR(log_file_size),2304 DRIZZLE_SYSVAR(log_file_size),
22892305
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_disable.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_disable.result 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_disable.result 2010-05-17 13:06:51 +0000
@@ -0,0 +1,6 @@
1SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
2NAME TYPE VALUE
3doublewrite BOOL false
4SHOW VARIABLES LIKE 'innodb_doublewrite';
5Variable_name Value
6innodb_doublewrite OFF
07
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_enable.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_enable.result 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_enable.result 2010-05-17 13:06:51 +0000
@@ -0,0 +1,6 @@
1SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
2NAME TYPE VALUE
3doublewrite BOOL true
4show variables like 'innodb_doublewrite';
5Variable_name Value
6innodb_doublewrite ON
07
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt 2010-05-17 13:06:51 +0000
@@ -0,0 +1,1 @@
1--plugin_add=embedded_innodb --plugin_remove=innobase --skip-innodb-doublewrite
02
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable.test 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable.test 2010-05-17 13:06:51 +0000
@@ -0,0 +1,2 @@
1SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
2SHOW VARIABLES LIKE 'innodb_doublewrite';
03
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt 2010-05-17 13:06:51 +0000
@@ -0,0 +1,1 @@
1--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-doublewrite
02
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable.test 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable.test 2010-05-17 13:06:51 +0000
@@ -0,0 +1,2 @@
1SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
2show variables like 'innodb_doublewrite';