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
=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.cc'
--- plugin/embedded_innodb/embedded_innodb_engine.cc 2010-05-17 13:07:21 +0000
+++ plugin/embedded_innodb/embedded_innodb_engine.cc 2010-05-17 13:07:22 +0000
@@ -2180,6 +2180,7 @@
2180static unsigned long innobase_fast_shutdown= 1;2180static unsigned long innobase_fast_shutdown= 1;
2181static bool srv_file_per_table= false;2181static bool srv_file_per_table= false;
2182static char* innobase_file_format_name = NULL;2182static char* innobase_file_format_name = NULL;
2183static unsigned long srv_flush_log_at_trx_commit;
2183static char default_innodb_data_file_path[]= "ibdata1:10M:autoextend";2184static char default_innodb_data_file_path[]= "ibdata1:10M:autoextend";
2184static char* innodb_data_file_path= NULL;2185static char* innodb_data_file_path= NULL;
21852186
@@ -2224,6 +2225,10 @@
2224 if (err != DB_SUCCESS)2225 if (err != DB_SUCCESS)
2225 goto innodb_error;2226 goto innodb_error;
22262227
2228 err= ib_cfg_set_int("flush_log_at_trx_commit", srv_flush_log_at_trx_commit);
2229 if (err != DB_SUCCESS)
2230 goto innodb_error;
2231
2227 err= ib_cfg_set_text("data_file_path", innodb_data_file_path);2232 err= ib_cfg_set_text("data_file_path", innodb_data_file_path);
2228 if (err != DB_SUCCESS)2233 if (err != DB_SUCCESS)
2229 goto innodb_error;2234 goto innodb_error;
@@ -2370,6 +2375,13 @@
2370 innodb_file_format_name_validate,2375 innodb_file_format_name_validate,
2371 innodb_file_format_name_update, "Barracuda");2376 innodb_file_format_name_update, "Barracuda");
23722377
2378static DRIZZLE_SYSVAR_ULONG(flush_log_at_trx_commit, srv_flush_log_at_trx_commit,
2379 PLUGIN_VAR_OPCMDARG,
2380 "Set to 0 (write and flush once per second),"
2381 " 1 (write and flush at each commit)"
2382 " or 2 (write at commit, flush once per second).",
2383 NULL, NULL, 1, 0, 2, 0);
2384
2373static DRIZZLE_SYSVAR_STR(data_file_path, innodb_data_file_path,2385static DRIZZLE_SYSVAR_STR(data_file_path, innodb_data_file_path,
2374 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,2386 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
2375 "Path to individual files and their sizes.",2387 "Path to individual files and their sizes.",
@@ -2398,6 +2410,7 @@
2398 DRIZZLE_SYSVAR(fast_shutdown),2410 DRIZZLE_SYSVAR(fast_shutdown),
2399 DRIZZLE_SYSVAR(file_per_table),2411 DRIZZLE_SYSVAR(file_per_table),
2400 DRIZZLE_SYSVAR(file_format),2412 DRIZZLE_SYSVAR(file_format),
2413 DRIZZLE_SYSVAR(flush_log_at_trx_commit),
2401 DRIZZLE_SYSVAR(data_file_path),2414 DRIZZLE_SYSVAR(data_file_path),
2402 DRIZZLE_SYSVAR(lock_wait_timeout),2415 DRIZZLE_SYSVAR(lock_wait_timeout),
2403 DRIZZLE_SYSVAR(log_file_size),2416 DRIZZLE_SYSVAR(log_file_size),
24042417
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit0.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit0.result 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit0.result 2010-05-17 13:07:22 +0000
@@ -0,0 +1,6 @@
1SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
2Variable_name Value
3innodb_flush_log_at_trx_commit 0
4SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
5NAME TYPE VALUE
6flush_log_at_trx_commit ULONG 0
07
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit1.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit1.result 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit1.result 2010-05-17 13:07:22 +0000
@@ -0,0 +1,6 @@
1SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
2Variable_name Value
3innodb_flush_log_at_trx_commit 1
4SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
5NAME TYPE VALUE
6flush_log_at_trx_commit ULONG 1
07
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit2.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit2.result 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_flush_log_at_trx_commit2.result 2010-05-17 13:07:22 +0000
@@ -0,0 +1,6 @@
1SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
2Variable_name Value
3innodb_flush_log_at_trx_commit 2
4SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
5NAME TYPE VALUE
6flush_log_at_trx_commit ULONG 2
07
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt'
--- 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
+++ 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
@@ -0,0 +1,1 @@
1--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-log-at-trx-commit=0
02
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0.test 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0.test 2010-05-17 13:07:22 +0000
@@ -0,0 +1,3 @@
1SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
2SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
3
04
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt'
--- 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
+++ 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
@@ -0,0 +1,1 @@
1--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-log-at-trx-commit=1
02
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1.test 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1.test 2010-05-17 13:07:22 +0000
@@ -0,0 +1,3 @@
1SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
2SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
3
04
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt'
--- 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
+++ 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
@@ -0,0 +1,1 @@
1--plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-log-at-trx-commit=2
02
=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2.test 1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2.test 2010-05-17 13:07:22 +0000
@@ -0,0 +1,3 @@
1SHOW VARIABLES LIKE 'innodb_flush_log_at_trx_commit';
2SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='flush_log_at_trx_commit';
3