Drizzle

Merge lp:~brianaker/drizzle/fix-non-repeat-tests into lp:~drizzle-trunk/drizzle/development

  1. fix-non-repeat-tests
  2. Merge into development
Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: not available
Merged at revision: 2425
Proposed branch: lp:~brianaker/drizzle/fix-non-repeat-tests
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 116 lines (+26/-8)
5 files modified
tests/r/greedy_optimizer.result (+3/-0)
tests/r/variables.result (+5/-4)
tests/suite/access/r/definer_test.result (+8/-0)
tests/t/greedy_optimizer.test (+3/-0)
tests/t/variables.test (+7/-4)
To merge this branch: bzr merge lp:~brianaker/drizzle/fix-non-repeat-tests
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+76633@code.launchpad.net
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 'tests/r/greedy_optimizer.result'
2--- tests/r/greedy_optimizer.result 2010-08-21 22:42:44 +0000
3+++ tests/r/greedy_optimizer.result 2011-09-22 17:58:23 +0000
4@@ -655,3 +655,6 @@
5 Variable_name Value
6 Last_query_cost #
7 drop table t1,t2,t3,t4,t5,t6,t7;
8+set optimizer_search_depth=default;
9+set optimizer_prune_level=default;
10+set optimizer_search_depth=default;
11
12=== modified file 'tests/r/variables.result'
13--- tests/r/variables.result 2011-01-16 11:16:55 +0000
14+++ tests/r/variables.result 2011-09-22 17:58:23 +0000
15@@ -1,4 +1,5 @@
16 drop table if exists t1,t2;
17+set @my_sort_buffer_size =@@global.sort_buffer_size;
18 set @my_max_heap_table_size =@@global.max_heap_table_size;
19 set @my_max_join_size =@@global.max_join_size;
20 set @my_mysql_protocol_buffer_length =@@global.mysql_protocol_buffer_length;
21@@ -549,7 +550,7 @@
22 set GLOBAL bulk_insert_buffer_size=DEFAULT;
23 set GLOBAL join_buffer_size=DEFAULT;
24 set GLOBAL max_allowed_packet=DEFAULT;
25-set GLOBAL max_heap_table_size=DEFAULT;
26+set GLOBAL max_heap_table_size=@my_max_heap_table_size;
27 set GLOBAL max_join_size=DEFAULT;
28 set GLOBAL max_sort_length=DEFAULT;
29 set GLOBAL max_write_lock_count=DEFAULT;
30@@ -557,8 +558,8 @@
31 set GLOBAL mysql_protocol_buffer_length=DEFAULT;
32 set GLOBAL read_buffer_size=DEFAULT;
33 set GLOBAL read_rnd_buffer_size=DEFAULT;
34-set GLOBAL server_id=DEFAULT;
35-set GLOBAL sort_buffer_size=DEFAULT;
36+set global server_id=@my_server_id;
37+set GLOBAL sort_buffer_size=@my_sort_buffer_size;
38 set GLOBAL table_open_cache=DEFAULT;
39 set GLOBAL storage_engine= @my_storage_engine;
40 set GLOBAL tmp_table_size=DEFAULT;
41@@ -566,7 +567,7 @@
42 set SESSION bulk_insert_buffer_size=DEFAULT;
43 set SESSION join_buffer_size=DEFAULT;
44 set SESSION max_allowed_packet=DEFAULT;
45-set SESSION max_heap_table_size=DEFAULT;
46+set SESSION max_heap_table_size=@my_max_heap_table_size;
47 set SESSION max_join_size=DEFAULT;
48 set SESSION max_sort_length=DEFAULT;
49 set SESSION read_buffer_size=DEFAULT;
50
51=== added file 'tests/suite/access/r/definer_test.result'
52--- tests/suite/access/r/definer_test.result 1970-01-01 00:00:00 +0000
53+++ tests/suite/access/r/definer_test.result 2011-09-22 17:58:23 +0000
54@@ -0,0 +1,8 @@
55+CREATE TABLE A (A SERIAL) DEFINER "mine";
56+SHOW CREATE TABLE A;
57+Table Create Table
58+A CREATE TABLE `A` (
59+ `A` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
60+ UNIQUE KEY `A` (`A`) USING BTREE
61+) ENGINE=InnoDB COLLATE = utf8_general_ci DEFINER 'mine'
62+DROP TABLE A;
63
64=== modified file 'tests/t/greedy_optimizer.test'
65--- tests/t/greedy_optimizer.test 2010-08-21 22:42:44 +0000
66+++ tests/t/greedy_optimizer.test 2011-09-22 17:58:23 +0000
67@@ -379,3 +379,6 @@
68 show status like 'Last_query_cost';
69
70 drop table t1,t2,t3,t4,t5,t6,t7;
71+set optimizer_search_depth=default;
72+set optimizer_prune_level=default;
73+set optimizer_search_depth=default;
74
75=== modified file 'tests/t/variables.test'
76--- tests/t/variables.test 2011-01-16 11:16:55 +0000
77+++ tests/t/variables.test 2011-09-22 17:58:23 +0000
78@@ -5,6 +5,9 @@
79 drop table if exists t1,t2;
80 --enable_warnings
81
82+#Store original
83+set @my_sort_buffer_size =@@global.sort_buffer_size;
84+
85 #
86 # Bug #19263: variables.test doesn't clean up after itself (I/II -- save)
87 #
88@@ -482,7 +485,7 @@
89 set GLOBAL bulk_insert_buffer_size=DEFAULT;
90 set GLOBAL join_buffer_size=DEFAULT;
91 set GLOBAL max_allowed_packet=DEFAULT;
92-set GLOBAL max_heap_table_size=DEFAULT;
93+set GLOBAL max_heap_table_size=@my_max_heap_table_size;
94 set GLOBAL max_join_size=DEFAULT;
95 set GLOBAL max_sort_length=DEFAULT;
96 set GLOBAL max_write_lock_count=DEFAULT;
97@@ -490,8 +493,8 @@
98 set GLOBAL mysql_protocol_buffer_length=DEFAULT;
99 set GLOBAL read_buffer_size=DEFAULT;
100 set GLOBAL read_rnd_buffer_size=DEFAULT;
101-set GLOBAL server_id=DEFAULT;
102-set GLOBAL sort_buffer_size=DEFAULT;
103+set global server_id=@my_server_id;
104+set GLOBAL sort_buffer_size=@my_sort_buffer_size;
105 set GLOBAL table_open_cache=DEFAULT;
106 set GLOBAL storage_engine= @my_storage_engine;
107 set GLOBAL tmp_table_size=DEFAULT;
108@@ -500,7 +503,7 @@
109 set SESSION bulk_insert_buffer_size=DEFAULT;
110 set SESSION join_buffer_size=DEFAULT;
111 set SESSION max_allowed_packet=DEFAULT;
112-set SESSION max_heap_table_size=DEFAULT;
113+set SESSION max_heap_table_size=@my_max_heap_table_size;
114 set SESSION max_join_size=DEFAULT;
115 set SESSION max_sort_length=DEFAULT;
116 set SESSION read_buffer_size=DEFAULT;