Drizzle

Merge lp:~stewart/drizzle/embedded-innodb-configuration-flush-log-at-trx-commit into lp:~drizzle-trunk/drizzle/development

  1. embedded-innodb-configuration-flush-log-at-trx-commit
  2. Merge into development
Proposed by Stewart Smith
Status: Merged
Merged at revision: 1536
Proposed branch: lp:~stewart/drizzle/embedded-innodb-configuration-flush-log-at-trx-commit
Merge into: lp:~drizzle-trunk/drizzle/development
Prerequisite: lp:~stewart/drizzle/embedded-innodb-configuration-file-format
Diff against target: 119 lines (+43/-0)
10 files modified
plugin/embedded_innodb/embedded_innodb_engine.cc (+13/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit0.result (+6/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit1.result (+6/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit2.result (+6/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt (+1/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0.test (+3/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt (+1/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1.test (+3/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt (+1/-0)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2.test (+3/-0)
To merge this branch: bzr merge lp:~stewart/drizzle/embedded-innodb-configuration-flush-log-at-trx-commit
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Brian Aker Pending
Review via email: mp+24806@code.launchpad.net

Description of the change

support flush_log_at_trx_commit option for 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-flush-log-at-trx-commit updated
1440. By Stewart Smith

Merged embedded-innodb-configuration-file-format into embedded-innodb-configuration-flush-log-at-trx-commit.

1441. By Stewart Smith

Merged embedded-innodb-configuration-file-format into embedded-innodb-configuration-flush-log-at-trx-commit.

1442. By Stewart Smith

merge trunk

1443. By Stewart Smith

Merged embedded-innodb-configuration-file-format into embedded-innodb-configuration-flush-log-at-trx-commit.

1444. By Stewart Smith

Merged embedded-innodb-configuration-file-format into embedded-innodb-configuration-flush-log-at-trx-commit.

1445. By Stewart Smith

Merged embedded-innodb-configuration-file-format into embedded-innodb-configuration-flush-log-at-trx-commit.

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:07:21 +0000
3+++ plugin/embedded_innodb/embedded_innodb_engine.cc 2010-05-17 13:07:22 +0000
4@@ -2180,6 +2180,7 @@
5 static unsigned long innobase_fast_shutdown= 1;
6 static bool srv_file_per_table= false;
7 static char* innobase_file_format_name = NULL;
8+static unsigned long srv_flush_log_at_trx_commit;
9 static char default_innodb_data_file_path[]= "ibdata1:10M:autoextend";
10 static char* innodb_data_file_path= NULL;
11
12@@ -2224,6 +2225,10 @@
13 if (err != DB_SUCCESS)
14 goto innodb_error;
15
16+ err= ib_cfg_set_int("flush_log_at_trx_commit", srv_flush_log_at_trx_commit);
17+ if (err != DB_SUCCESS)
18+ goto innodb_error;
19+
20 err= ib_cfg_set_text("data_file_path", innodb_data_file_path);
21 if (err != DB_SUCCESS)
22 goto innodb_error;
23@@ -2370,6 +2375,13 @@
24 innodb_file_format_name_validate,
25 innodb_file_format_name_update, "Barracuda");
26
27+static DRIZZLE_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit,
28+ PLUGIN_VAR_OPCMDARG,
29+ "Set to 0 (write and flush once per second),"
30+ " 1 (write and flush at each commit)"
31+ " or 2 (write at commit, flush once per second).",
32+ NULL, NULL, 1, 0, 2, 0);
33+
34 static DRIZZLE_SYSVAR_STR(data_file_path, innodb_data_file_path,
35 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
36 "Path to individual files and their sizes.",
37@@ -2398,6 +2410,7 @@
38 DRIZZLE_SYSVAR(fast_shutdown),
39 DRIZZLE_SYSVAR(file_per_table),
40 DRIZZLE_SYSVAR(file_format),
41+ DRIZZLE_SYSVAR(flush_log_at_trx_commit),
42 DRIZZLE_SYSVAR(data_file_path),
43 DRIZZLE_SYSVAR(lock_wait_timeout),
44 DRIZZLE_SYSVAR(log_file_size),
45
46=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit0.result'
47--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit0.result 1970-01-01 00:00:00 +0000
48+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit0.result 2010-05-17 13:07:22 +0000
49@@ -0,0 +1,6 @@
50+SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
51+Variable_name Value
52+innodb_flush_log_at_trx_commit 0
53+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
54+NAME TYPE VALUE
55+flush_log_at_trx_commit ULONG 0
56
57=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit1.result'
58--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit1.result 1970-01-01 00:00:00 +0000
59+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit1.result 2010-05-17 13:07:22 +0000
60@@ -0,0 +1,6 @@
61+SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
62+Variable_name Value
63+innodb_flush_log_at_trx_commit 1
64+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
65+NAME TYPE VALUE
66+flush_log_at_trx_commit ULONG 1
67
68=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit2.result'
69--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit2.result 1970-01-01 00:00:00 +0000
70+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit2.result 2010-05-17 13:07:22 +0000
71@@ -0,0 +1,6 @@
72+SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
73+Variable_name Value
74+innodb_flush_log_at_trx_commit 2
75+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
76+NAME TYPE VALUE
77+flush_log_at_trx_commit ULONG 2
78
79=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt'
80--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt 1970-01-01 00:00:00 +0000
81+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt 2010-05-17 13:07:22 +0000
82@@ -0,0 +1,1 @@
83+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-log-at-trx-commit=0
84
85=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0.test'
86--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0.test 1970-01-01 00:00:00 +0000
87+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0.test 2010-05-17 13:07:22 +0000
88@@ -0,0 +1,3 @@
89+SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
90+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
91+
92
93=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt'
94--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt 1970-01-01 00:00:00 +0000
95+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt 2010-05-17 13:07:22 +0000
96@@ -0,0 +1,1 @@
97+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-log-at-trx-commit=1
98
99=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1.test'
100--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1.test 1970-01-01 00:00:00 +0000
101+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1.test 2010-05-17 13:07:22 +0000
102@@ -0,0 +1,3 @@
103+SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
104+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
105+
106
107=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt'
108--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt 1970-01-01 00:00:00 +0000
109+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt 2010-05-17 13:07:22 +0000
110@@ -0,0 +1,1 @@
111+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-log-at-trx-commit=2
112
113=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2.test'
114--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2.test 1970-01-01 00:00:00 +0000
115+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2.test 2010-05-17 13:07:22 +0000
116@@ -0,0 +1,3 @@
117+SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
118+SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
119+