Drizzle

Merge lp:~linuxjedi/drizzle/trunk-bug-578644 into lp:~stewart/drizzle/haildb-2.3-cairo-updates

  1. trunk-bug-578644
  2. Merge into haildb-2.3-cairo-updates
Proposed by Andrew Hutchings
Status: Merged
Merge reported by: Stewart Smith
Merged at revision: not available
Proposed branch: lp:~linuxjedi/drizzle/trunk-bug-578644
Merge into: lp:~stewart/drizzle/haildb-2.3-cairo-updates
Diff against target: 34 lines (+4/-4)
3 files modified
plugin/haildb/tests/r/config_log_buffer_size_5m.result (+1/-1)
plugin/haildb/tests/r/config_log_buffer_size_default.result (+1/-1)
plugin/haildb/tests/r/config_table_function.result (+2/-2)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/trunk-bug-578644
Reviewer Review Type Date Requested Status
Stewart Smith Pending
Review via email: mp+45702@code.launchpad.net

Description of the change

Fix test cases for lp:~linuxjedi/haildb/trunk-bug-578644

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/haildb/tests/r/config_log_buffer_size_5m.result'
2--- plugin/haildb/tests/r/config_log_buffer_size_5m.result 2010-09-23 06:31:07 +0000
3+++ plugin/haildb/tests/r/config_log_buffer_size_5m.result 2011-01-10 14:53:12 +0000
4@@ -3,4 +3,4 @@
5 innodb_log_buffer_size 5242880
6 SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='log_buffer_size';
7 NAME TYPE VALUE
8-log_buffer_size ULINT 320
9+log_buffer_size ULINT 5242880
10
11=== modified file 'plugin/haildb/tests/r/config_log_buffer_size_default.result'
12--- plugin/haildb/tests/r/config_log_buffer_size_default.result 2010-09-23 06:31:07 +0000
13+++ plugin/haildb/tests/r/config_log_buffer_size_default.result 2011-01-10 14:53:12 +0000
14@@ -3,4 +3,4 @@
15 innodb_log_buffer_size 8388608
16 SELECT * FROM DATA_DICTIONARY.HAILDB_CONFIGURATION WHERE NAME='log_buffer_size';
17 NAME TYPE VALUE
18-log_buffer_size ULINT 512
19+log_buffer_size ULINT 8388608
20
21=== modified file 'plugin/haildb/tests/r/config_table_function.result'
22--- plugin/haildb/tests/r/config_table_function.result 2010-09-23 06:31:07 +0000
23+++ plugin/haildb/tests/r/config_table_function.result 2011-01-10 14:53:12 +0000
24@@ -65,8 +65,8 @@
25 force_recovery ULINT 0
26 io_capacity ULONG 200
27 lock_wait_timeout ULINT 5
28-log_buffer_size ULINT 512
29-log_file_size ULINT 1280
30+log_buffer_size ULINT 8388608
31+log_file_size ULINT 20971520
32 log_files_in_group ULINT 2
33 log_group_home_dir TEXT NULL
34 max_dirty_pages_pct ULONG 75

Subscribers

People subscribed via source and target branches