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
=== modified file 'tests/suite/big/r/variables-big.result'
--- tests/suite/big/r/variables-big.result 2009-06-07 12:05:17 +0000
+++ tests/suite/big/r/variables-big.result 2009-07-31 15:28:05 +0000
@@ -1,12 +1,12 @@
1set session transaction_prealloc_size=1024*1024*1024*1;1set session transaction_prealloc_size=1024*1024*1024*1;
2show processlist;2show processlist;
3Id User Host db Command Time State Info3Id User Host db Command Time State Info
41 root 127.0.0.1 test Query 0 NULL show processlist4# root 127.0.0.1 test Query 0 NULL show processlist
5set session transaction_prealloc_size=1024*1024*1024*2;5set session transaction_prealloc_size=1024*1024*1024*2;
6show processlist;6show processlist;
7Id User Host db Command Time State Info7Id User Host db Command Time State Info
81 root 127.0.0.1 test Query 0 NULL show processlist8# root 127.0.0.1 test Query 0 NULL show processlist
9set session transaction_prealloc_size=1024*1024*1024*3;9set session transaction_prealloc_size=1024*1024*1024*3;
10show processlist;10show processlist;
11Id User Host db Command Time State Info11Id User Host db Command Time State Info
121 root 127.0.0.1 test Query 0 NULL show processlist12# root 127.0.0.1 test Query 0 NULL show processlist
1313
=== modified file 'tests/suite/big/t/variables-big.test'
--- tests/suite/big/t/variables-big.test 2009-06-07 12:05:17 +0000
+++ tests/suite/big/t/variables-big.test 2009-07-31 15:28:05 +0000
@@ -7,10 +7,13 @@
7#7#
88
9set session transaction_prealloc_size=1024*1024*1024*1;9set session transaction_prealloc_size=1024*1024*1024*1;
10--replace_column 1 #
10show processlist;11show processlist;
11set session transaction_prealloc_size=1024*1024*1024*2;12set session transaction_prealloc_size=1024*1024*1024*2;
13--replace_column 1 #
12show processlist;14show processlist;
13set session transaction_prealloc_size=1024*1024*1024*3;15set session transaction_prealloc_size=1024*1024*1024*3;
16--replace_column 1 #
14show processlist;17show processlist;
1518
16# Drizzle bug #37782619# Drizzle bug #377826