Drizzle

Merge lp:~patrick-crews/drizzle/eng-spec-test-suites into lp:~drizzle-trunk/drizzle/development

  1. eng-spec-test-suites
  2. Merge into development
Proposed by Patrick Crews
Status: Merged
Approved by: Lee Bieber
Approved revision: 1760
Merged at revision: 1763
Proposed branch: lp:~patrick-crews/drizzle/eng-spec-test-suites
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 197 lines (+40/-40)
5 files modified
plugin/memory/ha_heap.h (+3/-3)
plugin/memory/heap.h (+3/-3)
plugin/memory/heap_priv.h (+3/-3)
plugin/memory/plugin.am (+30/-30)
plugin/memory/plugin.ini (+1/-1)
To merge this branch: bzr merge lp:~patrick-crews/drizzle/eng-spec-test-suites
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+35227@code.launchpad.net

Description of the change

Branch includes changes for:
https://blueprints.launchpad.net/drizzle/+spec/engine-specific-test-suites

Moved all engine-specific tests from the main suite and into their respective plugin directories.

Renamed plugin/heap -> plugin/memory and made needed pandora-build changes. This was necessary as 'make test' was running into issues. The plugin / engine name was memory, but the directory name was heap. Changed per discussion with Monty.

To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

Builds with "make distcheck" are failing when trying to merge in these changes

Revision history for this message
Patrick Crews (patrick-crews) wrote :

I'll look into this.

On Sun, Sep 12, 2010 at 8:07 PM, Lee Bieber <email address hidden> wrote:

> The proposal to merge lp:~patrick-crews/drizzle/eng-spec-test-suites into
> lp:drizzle has been updated.
>
> Status: Approved => Work in progress
> --
>
> https://code.launchpad.net/~patrick-crews/drizzle/eng-spec-test-suites/+merge/35227<https://code.launchpad.net/%7Epatrick-crews/drizzle/eng-spec-test-suites/+merge/35227>
> You are the owner of lp:~patrick-crews/drizzle/eng-spec-test-suites.
>

Revision history for this message
Patrick Crews (patrick-crews) wrote :

make distcheck will work now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'tests/r/deadlock_innodb.result' => 'plugin/innobase/tests/r/deadlock_innodb.result'
2=== renamed file 'tests/r/func_group_innodb.result' => 'plugin/innobase/tests/r/func_group_innodb.result'
3=== renamed file 'tests/r/group_min_max_innodb.result' => 'plugin/innobase/tests/r/group_min_max_innodb.result'
4=== renamed file 'tests/r/index_merge_innodb.result' => 'plugin/innobase/tests/r/index_merge_innodb.result'
5=== renamed file 'tests/r/innodb-semi-consistent.result' => 'plugin/innobase/tests/r/innodb-semi-consistent.result'
6=== renamed file 'tests/r/innodb.result' => 'plugin/innobase/tests/r/innodb.result'
7=== renamed file 'tests/r/innodb_mysql.result' => 'plugin/innobase/tests/r/innodb_mysql.result'
8=== renamed file 'tests/r/innodb_notembedded.result' => 'plugin/innobase/tests/r/innodb_notembedded.result'
9=== renamed file 'tests/r/innodb_trx_weight.result' => 'plugin/innobase/tests/r/innodb_trx_weight.result'
10=== renamed file 'tests/r/join_outer_innodb.result' => 'plugin/innobase/tests/r/join_outer_innodb.result'
11=== renamed file 'tests/r/loaddata_autocom_innodb.result' => 'plugin/innobase/tests/r/loaddata_autocom_innodb.result'
12=== renamed file 'tests/r/parser_bug21114_innodb.result' => 'plugin/innobase/tests/r/parser_bug21114_innodb.result'
13=== renamed file 'tests/r/rowid_order_innodb.result' => 'plugin/innobase/tests/r/rowid_order_innodb.result'
14=== renamed file 'tests/r/subselect_innodb.result' => 'plugin/innobase/tests/r/subselect_innodb.result'
15=== renamed file 'tests/r/unsafe_binlog_innodb.result' => 'plugin/innobase/tests/r/unsafe_binlog_innodb.result'
16=== renamed file 'tests/t/deadlock_innodb.test' => 'plugin/innobase/tests/t/deadlock_innodb.test'
17=== renamed file 'tests/t/func_group_innodb.test' => 'plugin/innobase/tests/t/func_group_innodb.test'
18=== renamed file 'tests/t/group_min_max_innodb.test' => 'plugin/innobase/tests/t/group_min_max_innodb.test'
19=== renamed file 'tests/t/index_merge_innodb.test' => 'plugin/innobase/tests/t/index_merge_innodb.test'
20=== renamed file 'tests/t/innodb-semi-consistent.test' => 'plugin/innobase/tests/t/innodb-semi-consistent.test'
21=== renamed file 'tests/t/innodb.test' => 'plugin/innobase/tests/t/innodb.test'
22=== renamed file 'tests/t/innodb_mysql.test' => 'plugin/innobase/tests/t/innodb_mysql.test'
23=== renamed file 'tests/t/innodb_notembedded.test' => 'plugin/innobase/tests/t/innodb_notembedded.test'
24=== renamed file 'tests/t/innodb_trx_weight.test' => 'plugin/innobase/tests/t/innodb_trx_weight.test'
25=== renamed file 'tests/t/join_outer_innodb.test' => 'plugin/innobase/tests/t/join_outer_innodb.test'
26=== renamed file 'tests/t/loaddata_autocom_innodb.test' => 'plugin/innobase/tests/t/loaddata_autocom_innodb.test'
27=== renamed file 'tests/t/parser_bug21114_innodb.test' => 'plugin/innobase/tests/t/parser_bug21114_innodb.test'
28=== renamed file 'tests/t/rowid_order_innodb.test' => 'plugin/innobase/tests/t/rowid_order_innodb.test'
29=== renamed file 'tests/t/subselect_innodb.test' => 'plugin/innobase/tests/t/subselect_innodb.test'
30=== renamed file 'tests/t/unsafe_binlog_innodb-master.opt' => 'plugin/innobase/tests/t/unsafe_binlog_innodb-master.opt'
31=== renamed file 'tests/t/unsafe_binlog_innodb.test' => 'plugin/innobase/tests/t/unsafe_binlog_innodb.test'
32=== renamed directory 'plugin/heap' => 'plugin/memory'
33=== modified file 'plugin/memory/ha_heap.h'
34--- plugin/heap/ha_heap.h 2010-09-08 16:59:59 +0000
35+++ plugin/memory/ha_heap.h 2010-09-13 13:21:06 +0000
36@@ -17,8 +17,8 @@
37
38 /* class for the the heap Cursor */
39
40-#ifndef PLUGIN_HEAP_HA_HEAP_H
41-#define PLUGIN_HEAP_HA_HEAP_H
42+#ifndef PLUGIN_MEMORY_HA_HEAP_H
43+#define PLUGIN_MEMORY_HA_HEAP_H
44
45 #include <drizzled/cursor.h>
46 #include <drizzled/thr_lock.h>
47@@ -96,4 +96,4 @@
48 void update_key_stats();
49 };
50
51-#endif /* PLUGIN_HEAP_HA_HEAP_H */
52+#endif /* PLUGIN_MEMORY_HA_HEAP_H */
53
54=== modified file 'plugin/memory/heap.h'
55--- plugin/heap/heap.h 2010-09-09 00:35:06 +0000
56+++ plugin/memory/heap.h 2010-09-13 13:21:06 +0000
57@@ -18,8 +18,8 @@
58 /* This file should be included when using heap_database_functions */
59 /* Author: Michael Widenius */
60
61-#ifndef PLUGIN_HEAP_HEAP_H
62-#define PLUGIN_HEAP_HEAP_H
63+#ifndef PLUGIN_MEMORY_HEAP_H
64+#define PLUGIN_MEMORY_HEAP_H
65
66 #include <drizzled/base.h>
67 #include <drizzled/common.h>
68@@ -314,4 +314,4 @@
69
70 typedef unsigned char *HEAP_PTR;
71
72-#endif /* PLUGIN_HEAP_HEAP_H */
73+#endif /* PLUGIN_MEMORY_HEAP_H */
74
75=== modified file 'plugin/memory/heap_priv.h'
76--- plugin/heap/heap_priv.h 2010-09-09 17:25:08 +0000
77+++ plugin/memory/heap_priv.h 2010-09-13 13:21:06 +0000
78@@ -14,8 +14,8 @@
79 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
80
81 /* This file is included in all heap-files */
82-#ifndef PLUGIN_HEAP_HEAP_PRIV_H
83-#define PLUGIN_HEAP_HEAP_PRIV_H
84+#ifndef PLUGIN_MEMORY_HEAP_PRIV_H
85+#define PLUGIN_MEMORY_HEAP_PRIV_H
86
87 #include "config.h"
88 #include <drizzled/base.h>
89@@ -107,4 +107,4 @@
90
91 extern boost::mutex THR_LOCK_heap;
92
93-#endif /* PLUGIN_HEAP_HEAP_PRIV_H */
94+#endif /* PLUGIN_MEMORY_HEAP_PRIV_H */
95
96=== modified file 'plugin/memory/plugin.am'
97--- plugin/heap/plugin.am 2010-05-12 05:03:43 +0000
98+++ plugin/memory/plugin.am 2010-09-13 13:21:06 +0000
99@@ -15,36 +15,36 @@
100 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
101
102 if BUILD_MEMORY_PLUGIN
103-noinst_LTLIBRARIES+= plugin/heap/libheap.la
104+noinst_LTLIBRARIES+= plugin/memory/libheap.la
105 endif
106 noinst_HEADERS+= \
107- plugin/heap/ha_heap.h \
108- plugin/heap/heap.h \
109- plugin/heap/heap_priv.h
110-plugin_heap_libheap_la_SOURCES= \
111- plugin/heap/hp_block.cc \
112- plugin/heap/hp_clear.cc \
113- plugin/heap/hp_close.cc \
114- plugin/heap/hp_create.cc \
115- plugin/heap/hp_delete.cc \
116- plugin/heap/hp_dspace.cc \
117- plugin/heap/hp_extra.cc \
118- plugin/heap/hp_hash.cc \
119- plugin/heap/hp_info.cc \
120- plugin/heap/hp_open.cc \
121- plugin/heap/hp_panic.cc \
122- plugin/heap/hp_record.cc \
123- plugin/heap/hp_rectest.cc \
124- plugin/heap/hp_rename.cc \
125- plugin/heap/hp_rfirst.cc \
126- plugin/heap/hp_rkey.cc \
127- plugin/heap/hp_rlast.cc \
128- plugin/heap/hp_rnext.cc \
129- plugin/heap/hp_rprev.cc \
130- plugin/heap/hp_rrnd.cc \
131- plugin/heap/hp_rsame.cc \
132- plugin/heap/hp_scan.cc \
133- plugin/heap/hp_static.cc \
134- plugin/heap/hp_update.cc \
135- plugin/heap/hp_write.cc
136+ plugin/memory/ha_heap.h \
137+ plugin/memory/heap.h \
138+ plugin/memory/heap_priv.h
139+plugin_memory_libheap_la_SOURCES= \
140+ plugin/memory/hp_block.cc \
141+ plugin/memory/hp_clear.cc \
142+ plugin/memory/hp_close.cc \
143+ plugin/memory/hp_create.cc \
144+ plugin/memory/hp_delete.cc \
145+ plugin/memory/hp_dspace.cc \
146+ plugin/memory/hp_extra.cc \
147+ plugin/memory/hp_hash.cc \
148+ plugin/memory/hp_info.cc \
149+ plugin/memory/hp_open.cc \
150+ plugin/memory/hp_panic.cc \
151+ plugin/memory/hp_record.cc \
152+ plugin/memory/hp_rectest.cc \
153+ plugin/memory/hp_rename.cc \
154+ plugin/memory/hp_rfirst.cc \
155+ plugin/memory/hp_rkey.cc \
156+ plugin/memory/hp_rlast.cc \
157+ plugin/memory/hp_rnext.cc \
158+ plugin/memory/hp_rprev.cc \
159+ plugin/memory/hp_rrnd.cc \
160+ plugin/memory/hp_rsame.cc \
161+ plugin/memory/hp_scan.cc \
162+ plugin/memory/hp_static.cc \
163+ plugin/memory/hp_update.cc \
164+ plugin/memory/hp_write.cc
165
166
167=== modified file 'plugin/memory/plugin.ini'
168--- plugin/heap/plugin.ini 2009-12-22 23:59:18 +0000
169+++ plugin/memory/plugin.ini 2010-09-13 13:21:06 +0000
170@@ -4,5 +4,5 @@
171 description=Volatile memory based tables
172 sources=ha_heap.cc
173 load_by_default=yes
174-libs=plugin/heap/libheap.la
175+libs=plugin/memory/libheap.la
176 static=yes
177
178=== added directory 'plugin/memory/tests'
179=== added directory 'plugin/memory/tests/r'
180=== renamed file 'tests/r/heap.result' => 'plugin/memory/tests/r/heap.result'
181=== renamed file 'tests/r/heap_auto_increment.result' => 'plugin/memory/tests/r/heap_auto_increment.result'
182=== renamed file 'tests/r/heap_btree.result' => 'plugin/memory/tests/r/heap_btree.result'
183=== renamed file 'tests/r/heap_hash.result' => 'plugin/memory/tests/r/heap_hash.result'
184=== renamed file 'tests/r/heap_var.result' => 'plugin/memory/tests/r/heap_var.result'
185=== added directory 'plugin/memory/tests/t'
186=== renamed file 'tests/t/heap.test' => 'plugin/memory/tests/t/heap.test'
187=== renamed file 'tests/t/heap_auto_increment.test' => 'plugin/memory/tests/t/heap_auto_increment.test'
188=== renamed file 'tests/t/heap_btree.test' => 'plugin/memory/tests/t/heap_btree.test'
189=== renamed file 'tests/t/heap_hash.test' => 'plugin/memory/tests/t/heap_hash.test'
190=== renamed file 'tests/t/heap_var.test' => 'plugin/memory/tests/t/heap_var.test'
191=== renamed file 'tests/r/index_merge_myisam.result' => 'plugin/myisam/tests/r/index_merge_myisam.result'
192=== renamed file 'tests/r/mix2_myisam.result' => 'plugin/myisam/tests/r/mix2_myisam.result'
193=== renamed file 'tests/r/myisam-blob.result' => 'plugin/myisam/tests/r/myisam-blob.result'
194=== renamed file 'tests/t/index_merge_myisam.test' => 'plugin/myisam/tests/t/index_merge_myisam.test'
195=== renamed file 'tests/t/mix2_myisam.test' => 'plugin/myisam/tests/t/mix2_myisam.test'
196=== renamed file 'tests/t/myisam-blob-master.opt' => 'plugin/myisam/tests/t/myisam-blob-master.opt'
197=== renamed file 'tests/t/myisam-blob.test' => 'plugin/myisam/tests/t/myisam-blob.test'