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
1=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.cc'
2--- plugin/embedded_innodb/embedded_innodb_engine.cc 2010-05-17 13:06:50 +0000
3+++ plugin/embedded_innodb/embedded_innodb_engine.cc 2010-05-17 13:06:51 +0000
4@@ -2175,6 +2175,7 @@
5
6 static bool innobase_use_checksums= true;
7 static char* innobase_data_home_dir = NULL;
8+static bool innobase_use_doublewrite= true;
9 static char default_innodb_data_file_path[]= "ibdata1:10M:autoextend";
10 static char* innodb_data_file_path= NULL;
11
12@@ -2199,6 +2200,14 @@
13 if (innodb_data_file_path == NULL)
14 innodb_data_file_path= default_innodb_data_file_path;
15
16+ if (innobase_use_doublewrite)
17+ err= ib_cfg_set_bool_on("doublewrite");
18+ else
19+ err= ib_cfg_set_bool_off("doublewrite");
20+
21+ if (err != DB_SUCCESS)
22+ goto innodb_error;
23+
24 err= ib_cfg_set_text("data_file_path", innodb_data_file_path);
25 if (err != DB_SUCCESS)
26 goto innodb_error;
27@@ -2260,6 +2269,12 @@
28 "The common part for InnoDB table spaces.",
29 NULL, NULL, NULL);
30
31+static DRIZZLE_SYSVAR_BOOL(doublewrite, innobase_use_doublewrite,
32+ PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
33+ "Enable InnoDB doublewrite buffer (enabled by default). "
34+ "Disable with --skip-innodb-doublewrite.",
35+ NULL, NULL, true);
36+
37 static DRIZZLE_SYSVAR_STR(data_file_path, innodb_data_file_path,
38 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
39 "Path to individual files and their sizes.",
40@@ -2283,6 +2298,7 @@
41 static drizzle_sys_var* innobase_system_variables[]= {
42 DRIZZLE_SYSVAR(checksums),
43 DRIZZLE_SYSVAR(data_home_dir),
44+ DRIZZLE_SYSVAR(doublewrite),
45 DRIZZLE_SYSVAR(data_file_path),
46 DRIZZLE_SYSVAR(lock_wait_timeout),
47 DRIZZLE_SYSVAR(log_file_size),
48
49=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_disable.result'
50--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_disable.result 1970-01-01 00:00:00 +0000
51+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_disable.result 2010-05-17 13:06:51 +0000
52@@ -0,0 +1,6 @@
53+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
54+NAME TYPE VALUE
55+doublewrite BOOL false
56+SHOW VARIABLES LIKE 'innodb_doublewrite';
57+Variable_name Value
58+innodb_doublewrite OFF
59
60=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_enable.result'
61--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_enable.result 1970-01-01 00:00:00 +0000
62+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_doublewrite_enable.result 2010-05-17 13:06:51 +0000
63@@ -0,0 +1,6 @@
64+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
65+NAME TYPE VALUE
66+doublewrite BOOL true
67+show variables like 'innodb_doublewrite';
68+Variable_name Value
69+innodb_doublewrite ON
70
71=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt'
72--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt 1970-01-01 00:00:00 +0000
73+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt 2010-05-17 13:06:51 +0000
74@@ -0,0 +1,1 @@
75+--plugin_add=embedded_innodb --plugin_remove=innobase --skip-innodb-doublewrite
76
77=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable.test'
78--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable.test 1970-01-01 00:00:00 +0000
79+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable.test 2010-05-17 13:06:51 +0000
80@@ -0,0 +1,2 @@
81+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
82+SHOW VARIABLES LIKE 'innodb_doublewrite';
83
84=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt'
85--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt 1970-01-01 00:00:00 +0000
86+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt 2010-05-17 13:06:51 +0000
87@@ -0,0 +1,1 @@
88+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-doublewrite
89
90=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable.test'
91--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable.test 1970-01-01 00:00:00 +0000
92+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable.test 2010-05-17 13:06:51 +0000
93@@ -0,0 +1,2 @@
94+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='doublewrite';
95+show variables like 'innodb_doublewrite';