Drizzle

Merge lp:~kalebral-deactivatedaccount/drizzle/drizzle-clean-code into lp:~drizzle-trunk/drizzle/development

  1. drizzle-clean-code
  2. Merge into development
Proposed by Lee Bieber
Status: Merged
Merged at revision: not available
Proposed branch: lp:~kalebral-deactivatedaccount/drizzle/drizzle-clean-code
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: None lines
To merge this branch: bzr merge lp:~kalebral-deactivatedaccount/drizzle/drizzle-clean-code
Reviewer Review Type Date Requested Status
Monty Taylor Approve
Review via email: mp+9515@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

per recommendation from Stewart, change results of variables-big test to replace column id with # as the ID was varying on different machines and test runs. I notice we do this on several other tests as well.

Revision history for this message
Monty Taylor (mordred) wrote :

Looks great. Merging in to my tree.

review: Approve
lp:~kalebral-deactivatedaccount/drizzle/drizzle-clean-code updated
1105. By lbieber <lbieber@lbieber-laptop>

merge with latest from trunk

1106. By lbieber <lbieber@lbieber-laptop>

merge with latest from trunk

1107. By lbieber <lbieber@lbieber-laptop>

merge with latest from trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/suite/big/r/variables-big.result'
2--- tests/suite/big/r/variables-big.result 2009-06-07 12:05:17 +0000
3+++ tests/suite/big/r/variables-big.result 2009-07-31 15:28:05 +0000
4@@ -1,12 +1,12 @@
5 set session transaction_prealloc_size=1024*1024*1024*1;
6 show processlist;
7 Id User Host db Command Time State Info
8-1 root 127.0.0.1 test Query 0 NULL show processlist
9+# root 127.0.0.1 test Query 0 NULL show processlist
10 set session transaction_prealloc_size=1024*1024*1024*2;
11 show processlist;
12 Id User Host db Command Time State Info
13-1 root 127.0.0.1 test Query 0 NULL show processlist
14+# root 127.0.0.1 test Query 0 NULL show processlist
15 set session transaction_prealloc_size=1024*1024*1024*3;
16 show processlist;
17 Id User Host db Command Time State Info
18-1 root 127.0.0.1 test Query 0 NULL show processlist
19+# root 127.0.0.1 test Query 0 NULL show processlist
20
21=== modified file 'tests/suite/big/t/variables-big.test'
22--- tests/suite/big/t/variables-big.test 2009-06-07 12:05:17 +0000
23+++ tests/suite/big/t/variables-big.test 2009-07-31 15:28:05 +0000
24@@ -7,10 +7,13 @@
25 #
26
27 set session transaction_prealloc_size=1024*1024*1024*1;
28+--replace_column 1 #
29 show processlist;
30 set session transaction_prealloc_size=1024*1024*1024*2;
31+--replace_column 1 #
32 show processlist;
33 set session transaction_prealloc_size=1024*1024*1024*3;
34+--replace_column 1 #
35 show processlist;
36
37 # Drizzle bug #377826