Drizzle

Merge lp:~dshrews/drizzle/bug746580_fremont into lp:~drizzle-trunk/drizzle/development

  1. bug746580_fremont
  2. Merge into development
Proposed by David Shrewsbury
Status: Merged
Merged at revision: 2261
Proposed branch: lp:~dshrews/drizzle/bug746580_fremont
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 646 lines (+68/-63)
39 files modified
.bzrignore (+1/-2)
plugin/filtered_replicator/tests/t/var_filteredschemas.test (+1/-1)
plugin/filtered_replicator/tests/t/var_filteredtables.test (+1/-1)
plugin/filtered_replicator/tests/t/var_schemaregex.test (+1/-1)
plugin/filtered_replicator/tests/t/var_tableregex.test (+1/-1)
plugin/storage_engine_api_tester/tests/t/txn_log_insert.test (+1/-1)
plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test (+1/-1)
plugin/transaction_log/plugin.am (+4/-4)
plugin/transaction_log/tests/t/alter.test (+2/-2)
plugin/transaction_log/tests/t/alter_schema.test (+1/-1)
plugin/transaction_log/tests/t/auto_commit.test (+2/-2)
plugin/transaction_log/tests/t/blob.test (+2/-2)
plugin/transaction_log/tests/t/create_select.test (+2/-2)
plugin/transaction_log/tests/t/create_table.test (+2/-2)
plugin/transaction_log/tests/t/delete.test (+2/-2)
plugin/transaction_log/tests/t/embedded_quotes.test (+1/-1)
plugin/transaction_log/tests/t/insert.test (+2/-2)
plugin/transaction_log/tests/t/insert_multi.test (+2/-2)
plugin/transaction_log/tests/t/insert_on_duplicate_update.test (+2/-2)
plugin/transaction_log/tests/t/insert_select.test (+2/-2)
plugin/transaction_log/tests/t/multi_column_primary_key.test (+2/-2)
plugin/transaction_log/tests/t/multi_table.test (+2/-2)
plugin/transaction_log/tests/t/no_modification.test (+2/-2)
plugin/transaction_log/tests/t/no_primary_key.test (+2/-2)
plugin/transaction_log/tests/t/null_values.test (+2/-2)
plugin/transaction_log/tests/t/rand.test (+2/-2)
plugin/transaction_log/tests/t/rename.test (+2/-2)
plugin/transaction_log/tests/t/replace.test (+2/-2)
plugin/transaction_log/tests/t/rollback.test (+2/-2)
plugin/transaction_log/tests/t/rollback_statement.test (+2/-2)
plugin/transaction_log/tests/t/schema.test (+2/-2)
plugin/transaction_log/tests/t/select_for_update.test (+2/-2)
plugin/transaction_log/tests/t/temp_tables.test (+1/-1)
plugin/transaction_log/tests/t/truncate.test (+1/-1)
plugin/transaction_log/tests/t/update.test (+2/-2)
tests/lib/drizzle_test_run/dtr_test_execution.py (+1/-0)
tests/lib/randgen/randgen_test_execution.py (+2/-1)
tests/lib/sys_mgmt/codeTree.py (+3/-0)
tests/test-run.pl (+1/-0)
To merge this branch: bzr merge lp:~dshrews/drizzle/bug746580_fremont
Reviewer Review Type Date Requested Status
Lee Bieber Pending
Review via email: mp+55999@code.launchpad.net

This proposal supersedes a proposal from 2011-03-31.

Description of the change

[UPDATEx2] Fix for old test runner.

[UPDATE] Rename from drizzle_trx_reader to drizzletrx after IRC discussion.

Renames transaction_reader program to drizzle_trx_reader and adds it to the installed binaries.

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

Breaks transaction tests, see http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-CentOS-5-64bit/1470/console for an example

transaction_log.create_table [ fail ]
sh: /home/lbieber/merge/build/tests/var/master-data/local/transaction.log: Text file busy
drizzletest: At line 18: command "$DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log" failed

The result from queries just before the failure was:
< snip >
, null_timestamp_field TIMESTAMP NULL
, not_null_timestamp_field TIMESTAMP NOT NULL
, null_double_field DOUBLE NULL
, not_null_double_field DOUBLE NOT NULL
, null_decimal_field DECIMAL(10,2) NULL
, not_null_decimal_field DECIMAL(10,2) NOT NULL
, PRIMARY KEY (autoinc_int_field)
);
DROP TABLE t1;
CREATE TABLE t1 (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
, key1 VARCHAR(10) NOT NULL
, key2 DOUBLE NOT NULL
, key3 BLOB NOT NULL
, UNIQUE KEY (key1)
, KEY named_key (key2)
, KEY partial_key (key3(30))
);

review: Needs Fixing
Revision history for this message
David Shrewsbury (dshrews) wrote : Posted in a previous version of this proposal

Had to add a fix for the old test runner.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2011-03-29 12:06:12 +0000
3+++ .bzrignore 2011-04-01 20:33:46 +0000
4@@ -113,7 +113,6 @@
5 drizzled/message/table_writer
6 drizzled/message/transaction.pb.cc
7 drizzled/message/transaction.pb.h
8-drizzled/message/transaction_reader
9 drizzled/message/transaction_writer
10 drizzled/module/load_list.h
11 drizzled/plugin/version.h
12@@ -221,7 +220,7 @@
13 plugin/myisam/myisampack
14 plugin/storage_engine_api_tester/cursor_states_to_dot
15 plugin/storage_engine_api_tester/engine_states_to_dot
16-plugin/transaction_log/utilities/transaction_reader
17+plugin/transaction_log/utilities/drizzletrx
18 po/POTFILES
19 po/drizzle7.pot
20 po/remove-potcdate.sed
21
22=== modified file 'plugin/filtered_replicator/tests/t/var_filteredschemas.test'
23--- plugin/filtered_replicator/tests/t/var_filteredschemas.test 2011-01-21 22:51:18 +0000
24+++ plugin/filtered_replicator/tests/t/var_filteredschemas.test 2011-04-01 20:33:46 +0000
25@@ -19,6 +19,6 @@
26 --echo We should only see the 'bar' schema in the log
27 --echo
28 --replace_result $DRIZZLETEST_VARDIR VARDIR
29---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
30+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
31
32 --source ../plugin/transaction_log/tests/t/truncate_log.inc
33
34=== modified file 'plugin/filtered_replicator/tests/t/var_filteredtables.test'
35--- plugin/filtered_replicator/tests/t/var_filteredtables.test 2011-01-21 22:51:18 +0000
36+++ plugin/filtered_replicator/tests/t/var_filteredtables.test 2011-04-01 20:33:46 +0000
37@@ -29,6 +29,6 @@
38 --echo
39 --replace_regex /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g/creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/ /transaction_id: [0-9]+/TRANSACTION_ID/ /$DRIZZLETEST_VARDIR/VARDIR/
40
41---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
42+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
43
44 --source ../plugin/transaction_log/tests/t/truncate_log.inc
45
46=== modified file 'plugin/filtered_replicator/tests/t/var_schemaregex.test'
47--- plugin/filtered_replicator/tests/t/var_schemaregex.test 2011-01-21 22:51:18 +0000
48+++ plugin/filtered_replicator/tests/t/var_schemaregex.test 2011-04-01 20:33:46 +0000
49@@ -22,6 +22,6 @@
50 --echo We should only see the 'bar' schema in the log
51 --echo
52 --replace_result $DRIZZLETEST_VARDIR VARDIR
53---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
54+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
55
56 --source ../plugin/transaction_log/tests/t/truncate_log.inc
57
58=== modified file 'plugin/filtered_replicator/tests/t/var_tableregex.test'
59--- plugin/filtered_replicator/tests/t/var_tableregex.test 2011-01-21 22:51:18 +0000
60+++ plugin/filtered_replicator/tests/t/var_tableregex.test 2011-04-01 20:33:46 +0000
61@@ -32,6 +32,6 @@
62 --echo
63 --replace_regex /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g/creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/ /transaction_id: [0-9]+/TRANSACTION_ID/ /$DRIZZLETEST_VARDIR/VARDIR/
64
65---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
66+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
67
68 --source ../plugin/transaction_log/tests/t/truncate_log.inc
69
70=== modified file 'plugin/storage_engine_api_tester/tests/t/txn_log_insert.test'
71--- plugin/storage_engine_api_tester/tests/t/txn_log_insert.test 2011-01-26 04:34:48 +0000
72+++ plugin/storage_engine_api_tester/tests/t/txn_log_insert.test 2011-04-01 20:33:46 +0000
73@@ -54,7 +54,7 @@
74 select seapitester_clear_engine_state_history();
75
76 --replace_result $DRIZZLETEST_VARDIR VARDIR
77---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
78+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
79
80 # Truncate the log file to reset for the next test
81 --source ../plugin/transaction_log/tests/t/truncate_log.inc
82
83=== modified file 'plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test'
84--- plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test 2011-01-26 04:34:48 +0000
85+++ plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test 2011-04-01 20:33:46 +0000
86@@ -52,7 +52,7 @@
87 select seapitester_clear_engine_state_history();
88
89 --replace_result $DRIZZLETEST_VARDIR VARDIR
90---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
91+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
92
93 # Truncate the log file to reset for the next test
94 --source ../plugin/transaction_log/tests/t/truncate_log.inc
95
96=== modified file 'plugin/transaction_log/plugin.am'
97--- plugin/transaction_log/plugin.am 2011-03-22 18:39:54 +0000
98+++ plugin/transaction_log/plugin.am 2011-04-01 20:33:46 +0000
99@@ -16,7 +16,7 @@
100
101
102 if BUILD_TRANSACTION_LOG_PLUGIN
103-noinst_PROGRAMS += plugin/transaction_log/utilities/transaction_reader
104+bin_PROGRAMS += plugin/transaction_log/utilities/drizzletrx
105 endif
106
107 noinst_HEADERS += \
108@@ -24,13 +24,13 @@
109 plugin/transaction_log/utilities/transaction_manager.h \
110 plugin/transaction_log/utilities/transaction_log_connection.h
111
112-plugin_transaction_log_utilities_transaction_reader_SOURCES = \
113+plugin_transaction_log_utilities_drizzletrx_SOURCES = \
114 plugin/transaction_log/utilities/transaction_reader.cc \
115 plugin/transaction_log/utilities/transaction_file_reader.cc \
116 plugin/transaction_log/utilities/transaction_manager.cc \
117 plugin/transaction_log/utilities/transaction_log_connection.cc
118
119-plugin_transaction_log_utilities_transaction_reader_LDADD = \
120+plugin_transaction_log_utilities_drizzletrx_LDADD = \
121 drizzled/message/libdrizzledmessage.la \
122 drizzled/internal/libinternal.la \
123 drizzled/algorithm/libhash.la \
124@@ -41,4 +41,4 @@
125 ${LTLIBINTL} \
126 $(GCOV_LIBS)
127
128-plugin_transaction_log_utilities_transaction_reader_CXXFLAGS = ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS} ${NO_WERROR} ${LIBDRIZZLE_CPPFLAGS}
129+plugin_transaction_log_utilities_drizzletrx_CXXFLAGS = ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS} ${NO_WERROR} ${LIBDRIZZLE_CPPFLAGS}
130
131=== modified file 'plugin/transaction_log/tests/t/alter.test'
132--- plugin/transaction_log/tests/t/alter.test 2011-01-21 22:24:55 +0000
133+++ plugin/transaction_log/tests/t/alter.test 2011-04-01 20:33:46 +0000
134@@ -17,11 +17,11 @@
135
136 # Read in the transaction.log.
137 --replace_result $DRIZZLETEST_VARDIR VARDIR
138---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
139+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
140
141 --echo
142 --echo Generating statements for innodb replication log
143---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
144+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
145
146 # Truncate the log file to reset for the next test
147 --source ../plugin/transaction_log/tests/t/truncate_log.inc
148
149=== modified file 'plugin/transaction_log/tests/t/alter_schema.test'
150--- plugin/transaction_log/tests/t/alter_schema.test 2011-01-21 22:24:55 +0000
151+++ plugin/transaction_log/tests/t/alter_schema.test 2011-04-01 20:33:46 +0000
152@@ -10,7 +10,7 @@
153
154 --echo
155 --replace_result $DRIZZLETEST_VARDIR VARDIR
156---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
157+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
158
159 --disable_query_log
160 DROP SCHEMA alter_schema_test;
161
162=== modified file 'plugin/transaction_log/tests/t/auto_commit.test'
163--- plugin/transaction_log/tests/t/auto_commit.test 2011-01-21 22:24:55 +0000
164+++ plugin/transaction_log/tests/t/auto_commit.test 2011-04-01 20:33:46 +0000
165@@ -18,11 +18,11 @@
166 # Read in the transaction.log.
167
168 --replace_result $DRIZZLETEST_VARDIR VARDIR
169---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
170+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
171
172 --echo
173 --echo Generating statements for innodb replication log
174---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
175+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
176
177 # Truncate the log file to reset for the next test
178 --source ../plugin/transaction_log/tests/t/truncate_log.inc
179
180=== modified file 'plugin/transaction_log/tests/t/blob.test'
181--- plugin/transaction_log/tests/t/blob.test 2011-01-21 22:24:55 +0000
182+++ plugin/transaction_log/tests/t/blob.test 2011-04-01 20:33:46 +0000
183@@ -19,11 +19,11 @@
184 # Read in the transaction.log.
185
186 --replace_result $DRIZZLETEST_VARDIR VARDIR
187---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
188+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
189
190 --echo
191 --echo Generating statements for innodb replication log
192---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
193+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
194
195 # Truncate the log file to reset for the next test
196 --source ../plugin/transaction_log/tests/t/truncate_log.inc
197
198=== modified file 'plugin/transaction_log/tests/t/create_select.test'
199--- plugin/transaction_log/tests/t/create_select.test 2011-01-21 22:24:55 +0000
200+++ plugin/transaction_log/tests/t/create_select.test 2011-04-01 20:33:46 +0000
201@@ -15,11 +15,11 @@
202 # Read in the transaction.log.
203
204 --replace_result $DRIZZLETEST_VARDIR VARDIR
205---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
206+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
207
208 --echo
209 --echo Generating statements for innodb replication log
210---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
211+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
212
213 # Truncate the log file to reset for the next test
214 --source ../plugin/transaction_log/tests/t/truncate_log.inc
215
216=== modified file 'plugin/transaction_log/tests/t/create_table.test'
217--- plugin/transaction_log/tests/t/create_table.test 2011-01-21 22:24:55 +0000
218+++ plugin/transaction_log/tests/t/create_table.test 2011-04-01 20:33:46 +0000
219@@ -15,11 +15,11 @@
220 # Read in the transaction.log.
221
222 --replace_result $DRIZZLETEST_VARDIR VARDIR
223---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
224+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
225
226 --echo
227 --echo Generating statements for innodb replication log
228---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
229+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
230
231 # Truncate the log file to reset for the next test
232 --source ../plugin/transaction_log/tests/t/truncate_log.inc
233
234=== modified file 'plugin/transaction_log/tests/t/delete.test'
235--- plugin/transaction_log/tests/t/delete.test 2011-01-21 22:24:55 +0000
236+++ plugin/transaction_log/tests/t/delete.test 2011-04-01 20:33:46 +0000
237@@ -19,11 +19,11 @@
238 # Read in the transaction.log.
239
240 --replace_result $DRIZZLETEST_VARDIR VARDIR
241---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
242+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
243
244 --echo
245 --echo Generating statements for innodb replication log
246---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
247+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
248
249 # Truncate the log file to reset for the next test
250 --source ../plugin/transaction_log/tests/t/truncate_log.inc
251
252=== modified file 'plugin/transaction_log/tests/t/embedded_quotes.test'
253--- plugin/transaction_log/tests/t/embedded_quotes.test 2011-01-21 22:24:55 +0000
254+++ plugin/transaction_log/tests/t/embedded_quotes.test 2011-04-01 20:33:46 +0000
255@@ -14,7 +14,7 @@
256 # Read in the transaction.log.
257
258 --replace_result $DRIZZLETEST_VARDIR VARDIR
259---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
260+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
261
262 DROP TABLE t;
263
264
265=== modified file 'plugin/transaction_log/tests/t/insert.test'
266--- plugin/transaction_log/tests/t/insert.test 2011-01-21 22:24:55 +0000
267+++ plugin/transaction_log/tests/t/insert.test 2011-04-01 20:33:46 +0000
268@@ -19,11 +19,11 @@
269 # Read in the transaction.log.
270
271 --replace_result $DRIZZLETEST_VARDIR VARDIR
272---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
273+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
274
275 --echo
276 --echo Generating statements for innodb replication log
277---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
278+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
279
280 # Truncate the log file to reset for the next test
281 --source ../plugin/transaction_log/tests/t/truncate_log.inc
282
283=== modified file 'plugin/transaction_log/tests/t/insert_multi.test'
284--- plugin/transaction_log/tests/t/insert_multi.test 2011-01-21 22:24:55 +0000
285+++ plugin/transaction_log/tests/t/insert_multi.test 2011-04-01 20:33:46 +0000
286@@ -19,11 +19,11 @@
287 # Read in the transaction.log.
288
289 --replace_result $DRIZZLETEST_VARDIR VARDIR
290---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
291+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
292
293 --echo
294 --echo Generating statements for innodb replication log
295---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
296+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
297
298 # Truncate the log file to reset for the next test
299 --source ../plugin/transaction_log/tests/t/truncate_log.inc
300
301=== modified file 'plugin/transaction_log/tests/t/insert_on_duplicate_update.test'
302--- plugin/transaction_log/tests/t/insert_on_duplicate_update.test 2011-01-21 22:24:55 +0000
303+++ plugin/transaction_log/tests/t/insert_on_duplicate_update.test 2011-04-01 20:33:46 +0000
304@@ -18,11 +18,11 @@
305 # Read in the transaction.log.
306
307 --replace_result $DRIZZLETEST_VARDIR VARDIR
308---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
309+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
310
311 --echo
312 --echo Generating statements for innodb replication log
313---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
314+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
315
316 # Truncate the log file to reset for the next test
317 --source ../plugin/transaction_log/tests/t/truncate_log.inc
318
319=== modified file 'plugin/transaction_log/tests/t/insert_select.test'
320--- plugin/transaction_log/tests/t/insert_select.test 2011-01-21 22:24:55 +0000
321+++ plugin/transaction_log/tests/t/insert_select.test 2011-04-01 20:33:46 +0000
322@@ -19,11 +19,11 @@
323 # Read in the transaction.log.
324
325 --replace_result $DRIZZLETEST_VARDIR VARDIR
326---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
327+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
328
329 --echo
330 --echo Generating statements for innodb replication log
331---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
332+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
333
334 # Truncate the log file to reset for the next test
335 --source ../plugin/transaction_log/tests/t/truncate_log.inc
336
337=== modified file 'plugin/transaction_log/tests/t/multi_column_primary_key.test'
338--- plugin/transaction_log/tests/t/multi_column_primary_key.test 2011-01-21 22:24:55 +0000
339+++ plugin/transaction_log/tests/t/multi_column_primary_key.test 2011-04-01 20:33:46 +0000
340@@ -15,11 +15,11 @@
341 # Read in the transaction.log.
342
343 --replace_result $DRIZZLETEST_VARDIR VARDIR
344---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
345+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
346
347 --echo
348 --echo Generating statements for innodb replication log
349---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
350+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
351
352 # Truncate the log file to reset for the next test
353 --source ../plugin/transaction_log/tests/t/truncate_log.inc
354
355=== modified file 'plugin/transaction_log/tests/t/multi_table.test'
356--- plugin/transaction_log/tests/t/multi_table.test 2011-01-21 22:24:55 +0000
357+++ plugin/transaction_log/tests/t/multi_table.test 2011-04-01 20:33:46 +0000
358@@ -19,11 +19,11 @@
359 # Read in the transaction.log.
360
361 --replace_result $DRIZZLETEST_VARDIR VARDIR
362---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
363+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
364
365 --echo
366 --echo Generating statements for innodb replication log
367---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
368+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
369
370 # Truncate the log file to reset for the next test
371 --source ../plugin/transaction_log/tests/t/truncate_log.inc
372
373=== modified file 'plugin/transaction_log/tests/t/no_modification.test'
374--- plugin/transaction_log/tests/t/no_modification.test 2011-01-21 22:24:55 +0000
375+++ plugin/transaction_log/tests/t/no_modification.test 2011-04-01 20:33:46 +0000
376@@ -19,11 +19,11 @@
377 # Read in the transaction.log.
378
379 --replace_result $DRIZZLETEST_VARDIR VARDIR
380---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
381+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
382
383 --echo
384 --echo Generating statements for innodb replication log
385---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
386+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
387
388 # Truncate the log file to reset for the next test
389 --source ../plugin/transaction_log/tests/t/truncate_log.inc
390
391=== modified file 'plugin/transaction_log/tests/t/no_primary_key.test'
392--- plugin/transaction_log/tests/t/no_primary_key.test 2011-01-21 22:24:55 +0000
393+++ plugin/transaction_log/tests/t/no_primary_key.test 2011-04-01 20:33:46 +0000
394@@ -20,11 +20,11 @@
395 # Read in the transaction.log.
396
397 --replace_result $DRIZZLETEST_VARDIR VARDIR
398---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
399+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
400
401 --echo
402 --echo Generating statements for innodb replication log
403---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
404+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
405
406 # Truncate the log file to reset for the next test
407 --source ../plugin/transaction_log/tests/t/truncate_log.inc
408
409=== modified file 'plugin/transaction_log/tests/t/null_values.test'
410--- plugin/transaction_log/tests/t/null_values.test 2011-01-21 22:24:55 +0000
411+++ plugin/transaction_log/tests/t/null_values.test 2011-04-01 20:33:46 +0000
412@@ -19,11 +19,11 @@
413 # Read in the transaction.log.
414
415 --replace_result $DRIZZLETEST_VARDIR VARDIR
416---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
417+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
418
419 --echo
420 --echo Generating statements for innodb replication log
421---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
422+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
423
424 # Truncate the log file to reset for the next test
425 --source ../plugin/transaction_log/tests/t/truncate_log.inc
426
427=== modified file 'plugin/transaction_log/tests/t/rand.test'
428--- plugin/transaction_log/tests/t/rand.test 2011-01-21 22:24:55 +0000
429+++ plugin/transaction_log/tests/t/rand.test 2011-04-01 20:33:46 +0000
430@@ -15,11 +15,11 @@
431 # Read in the transaction.log.
432
433 --replace_result $DRIZZLETEST_VARDIR VARDIR
434---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
435+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
436
437 --echo
438 --echo Generating statements for innodb replication log
439---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
440+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
441
442 # Truncate the log file to reset for the next test
443 --source ../plugin/transaction_log/tests/t/truncate_log.inc
444
445=== modified file 'plugin/transaction_log/tests/t/rename.test'
446--- plugin/transaction_log/tests/t/rename.test 2011-01-21 22:24:55 +0000
447+++ plugin/transaction_log/tests/t/rename.test 2011-04-01 20:33:46 +0000
448@@ -19,11 +19,11 @@
449 # Read in the transaction.log.
450
451 --replace_result $DRIZZLETEST_VARDIR VARDIR
452---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
453+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
454
455 --echo
456 --echo Generating statements for innodb replication log
457---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
458+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
459
460 # Truncate the log file to reset for the next test
461 --source ../plugin/transaction_log/tests/t/truncate_log.inc
462
463=== modified file 'plugin/transaction_log/tests/t/replace.test'
464--- plugin/transaction_log/tests/t/replace.test 2011-01-21 22:24:55 +0000
465+++ plugin/transaction_log/tests/t/replace.test 2011-04-01 20:33:46 +0000
466@@ -20,11 +20,11 @@
467 # Read in the transaction.log.
468
469 --replace_result $DRIZZLETEST_VARDIR VARDIR
470---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
471+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
472
473 --echo
474 --echo Generating statements for innodb replication log
475---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
476+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
477
478 # Truncate the log file to reset for the next test
479 --source ../plugin/transaction_log/tests/t/truncate_log.inc
480
481=== modified file 'plugin/transaction_log/tests/t/rollback.test'
482--- plugin/transaction_log/tests/t/rollback.test 2011-01-21 22:24:55 +0000
483+++ plugin/transaction_log/tests/t/rollback.test 2011-04-01 20:33:46 +0000
484@@ -20,11 +20,11 @@
485 # Read in the transaction.log.
486
487 --replace_result $DRIZZLETEST_VARDIR VARDIR
488---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
489+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
490
491 --echo
492 --echo Generating statements for innodb replication log
493---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
494+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
495
496 # Truncate the log file to reset for the next test
497 --source ../plugin/transaction_log/tests/t/truncate_log.inc
498
499=== modified file 'plugin/transaction_log/tests/t/rollback_statement.test'
500--- plugin/transaction_log/tests/t/rollback_statement.test 2011-01-26 04:34:48 +0000
501+++ plugin/transaction_log/tests/t/rollback_statement.test 2011-04-01 20:33:46 +0000
502@@ -45,11 +45,11 @@
503
504 --echo
505 --replace_regex /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g /creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/ /transaction_id: [0-9]+/TRANSACTION_ID/ /$DRIZZLETEST_VARDIR/VARDIR/
506---exec ../plugin/transaction_log/utilities/transaction_reader --raw $DRIZZLETEST_VARDIR/master-data/local/transaction.log
507+--exec $DRIZZLE_TRX_READER --raw $DRIZZLETEST_VARDIR/master-data/local/transaction.log
508
509 --echo
510 --replace_result $DRIZZLETEST_VARDIR VARDIR
511---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
512+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
513
514 --disable_query_log
515 DROP TABLE src;
516
517=== modified file 'plugin/transaction_log/tests/t/schema.test'
518--- plugin/transaction_log/tests/t/schema.test 2011-01-21 22:24:55 +0000
519+++ plugin/transaction_log/tests/t/schema.test 2011-04-01 20:33:46 +0000
520@@ -15,11 +15,11 @@
521 # Read in the transaction.log.
522
523 --replace_result $DRIZZLETEST_VARDIR VARDIR
524---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
525+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
526
527 --echo
528 --echo Generating statements for innodb replication log
529---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
530+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
531
532 # Truncate the log file to reset for the next test
533 --source ../plugin/transaction_log/tests/t/truncate_log.inc
534
535=== modified file 'plugin/transaction_log/tests/t/select_for_update.test'
536--- plugin/transaction_log/tests/t/select_for_update.test 2011-01-21 22:24:55 +0000
537+++ plugin/transaction_log/tests/t/select_for_update.test 2011-04-01 20:33:46 +0000
538@@ -20,11 +20,11 @@
539 # Read in the transaction.log.
540
541 --replace_result $DRIZZLETEST_VARDIR VARDIR
542---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
543+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
544
545 --echo
546 --echo Generating statements for innodb replication log
547---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
548+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
549
550 # Truncate the log file to reset for the next test
551 --source ../plugin/transaction_log/tests/t/truncate_log.inc
552
553=== modified file 'plugin/transaction_log/tests/t/temp_tables.test'
554--- plugin/transaction_log/tests/t/temp_tables.test 2011-01-21 22:24:55 +0000
555+++ plugin/transaction_log/tests/t/temp_tables.test 2011-04-01 20:33:46 +0000
556@@ -7,7 +7,7 @@
557
558 # Read in the transaction.log.
559 --replace_result $DRIZZLETEST_VARDIR VARDIR
560---exec ../plugin/transaction_log/utilities/transaction_reader --ignore-events $DRIZZLETEST_VARDIR/master-data/local/transaction.log
561+--exec $DRIZZLE_TRX_READER --ignore-events $DRIZZLETEST_VARDIR/master-data/local/transaction.log
562
563 # Truncate the log file to reset for the next test
564 --source ../plugin/transaction_log/tests/t/truncate_log.inc
565
566=== modified file 'plugin/transaction_log/tests/t/truncate.test'
567--- plugin/transaction_log/tests/t/truncate.test 2011-01-21 22:24:55 +0000
568+++ plugin/transaction_log/tests/t/truncate.test 2011-04-01 20:33:46 +0000
569@@ -13,7 +13,7 @@
570 # Read in the transaction.log.
571
572 --replace_result $DRIZZLETEST_VARDIR VARDIR
573---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
574+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
575
576 # Truncate the log file to reset for the next test
577 --source ../plugin/transaction_log/tests/t/truncate_log.inc
578
579=== modified file 'plugin/transaction_log/tests/t/update.test'
580--- plugin/transaction_log/tests/t/update.test 2011-01-21 22:24:55 +0000
581+++ plugin/transaction_log/tests/t/update.test 2011-04-01 20:33:46 +0000
582@@ -19,11 +19,11 @@
583 # Read in the transaction.log.
584
585 --replace_result $DRIZZLETEST_VARDIR VARDIR
586---exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log
587+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
588
589 --echo
590 --echo Generating statements for innodb replication log
591---exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
592+--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
593
594 # Truncate the log file to reset for the next test
595 --source ../plugin/transaction_log/tests/t/truncate_log.inc
596
597=== modified file 'tests/lib/drizzle_test_run/dtr_test_execution.py'
598--- tests/lib/drizzle_test_run/dtr_test_execution.py 2011-03-17 06:31:49 +0000
599+++ tests/lib/drizzle_test_run/dtr_test_execution.py 2011-04-01 20:33:46 +0000
600@@ -183,6 +183,7 @@
601 , self.master_server.master_port)
602 , 'DRIZZLE_ADMIN' : "%s -uroot -p%d" %( self.master_server.drizzleadmin
603 , self.master_server.master_port)
604+ , 'DRIZZLE_TRX_READER' : self.system_manager.code_tree.drizzle_trx_reader
605 }
606
607 self.working_environment = self.system_manager.create_working_environment(env_reqs)
608
609=== modified file 'tests/lib/randgen/randgen_test_execution.py'
610--- tests/lib/randgen/randgen_test_execution.py 2011-03-17 21:52:36 +0000
611+++ tests/lib/randgen/randgen_test_execution.py 2011-04-01 20:33:46 +0000
612@@ -154,7 +154,8 @@
613 , self.master_server.master_port)
614 , 'DRIZZLE_ADMIN' : "%s -uroot -p%d" %( self.master_server.drizzleadmin
615 , self.master_server.master_port)
616- , 'DRIZZLE_BASEDIR' : "%s" %(self.system_manager.code_tree.basedir)
617+ , 'DRIZZLE_BASEDIR' : self.system_manager.code_tree.basedir
618+ , 'DRIZZLE_TRX_READER' : self.system_manager.code_tree.drizzle_trx_reader
619 }
620
621
622
623=== modified file 'tests/lib/sys_mgmt/codeTree.py'
624--- tests/lib/sys_mgmt/codeTree.py 2011-03-23 18:56:05 +0000
625+++ tests/lib/sys_mgmt/codeTree.py 2011-04-01 20:33:46 +0000
626@@ -103,6 +103,9 @@
627 self.drizzletest = self.system_manager.find_path([os.path.join(self.clientbindir,
628 'drizzletest')])
629
630+ self.drizzle_trx_reader = self.system_manager.find_path([os.path.join(self.basedir,
631+ 'plugin/transaction_log/utilities/drizzletrx')])
632+
633 self.server_version_string = None
634 self.server_executable = None
635 self.server_version = None
636
637=== modified file 'tests/test-run.pl'
638--- tests/test-run.pl 2011-03-19 23:46:12 +0000
639+++ tests/test-run.pl 2011-04-01 20:33:46 +0000
640@@ -1503,6 +1503,7 @@
641 $ENV{'PBMS_PORT'}= $opt_pbms_myport;
642 $ENV{'RABBITMQ_NODE_PORT'}= $opt_rabbitmq_myport;
643 $ENV{'DRIZZLE_TCP_PORT'}= $drizzled_variables{'drizzle-protocol.port'};
644+ $ENV{'DRIZZLE_TRX_READER'} = $opt_top_builddir.'/plugin/transaction_log/utilities/drizzletrx';
645
646 $ENV{'DTR_BUILD_THREAD'}= $opt_dtr_build_thread;
647