Drizzle

Merge lp:~dshrews/drizzle/bug746580_elliott into lp:drizzle/7.0

  1. bug746580_elliott
  2. Merge into 7.0
Proposed by David Shrewsbury
Status: Merged
Approved by: Brian Aker
Approved revision: 2243
Merged at revision: 2242
Proposed branch: lp:~dshrews/drizzle/bug746580_elliott
Merge into: lp:drizzle/7.0
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_elliott
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+55838@code.launchpad.net

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

Description of the change

[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.
lp:~dshrews/drizzle/bug746580_elliott updated
2244. By David Shrewsbury

Fix for old test runner.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2011-03-10 18:13:13 +0000
+++ .bzrignore 2011-04-01 20:13:32 +0000
@@ -111,7 +111,6 @@
111drizzled/message/table_writer111drizzled/message/table_writer
112drizzled/message/transaction.pb.cc112drizzled/message/transaction.pb.cc
113drizzled/message/transaction.pb.h113drizzled/message/transaction.pb.h
114drizzled/message/transaction_reader
115drizzled/message/transaction_writer114drizzled/message/transaction_writer
116drizzled/module/load_list.h115drizzled/module/load_list.h
117drizzled/plugin/version.h116drizzled/plugin/version.h
@@ -219,7 +218,7 @@
219plugin/myisam/myisampack218plugin/myisam/myisampack
220plugin/storage_engine_api_tester/cursor_states_to_dot219plugin/storage_engine_api_tester/cursor_states_to_dot
221plugin/storage_engine_api_tester/engine_states_to_dot220plugin/storage_engine_api_tester/engine_states_to_dot
222plugin/transaction_log/utilities/transaction_reader221plugin/transaction_log/utilities/drizzletrx
223po/POTFILES222po/POTFILES
224po/drizzle7.pot223po/drizzle7.pot
225po/remove-potcdate.sed224po/remove-potcdate.sed
226225
=== modified file 'plugin/filtered_replicator/tests/t/var_filteredschemas.test'
--- plugin/filtered_replicator/tests/t/var_filteredschemas.test 2011-01-21 22:51:18 +0000
+++ plugin/filtered_replicator/tests/t/var_filteredschemas.test 2011-04-01 20:13:32 +0000
@@ -19,6 +19,6 @@
19--echo We should only see the 'bar' schema in the log19--echo We should only see the 'bar' schema in the log
20--echo20--echo
21--replace_result $DRIZZLETEST_VARDIR VARDIR21--replace_result $DRIZZLETEST_VARDIR VARDIR
22--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log22--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2323
24--source ../plugin/transaction_log/tests/t/truncate_log.inc24--source ../plugin/transaction_log/tests/t/truncate_log.inc
2525
=== modified file 'plugin/filtered_replicator/tests/t/var_filteredtables.test'
--- plugin/filtered_replicator/tests/t/var_filteredtables.test 2011-01-21 22:51:18 +0000
+++ plugin/filtered_replicator/tests/t/var_filteredtables.test 2011-04-01 20:13:32 +0000
@@ -29,6 +29,6 @@
29--echo29--echo
30--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/30--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/
3131
32--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log32--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
3333
34--source ../plugin/transaction_log/tests/t/truncate_log.inc34--source ../plugin/transaction_log/tests/t/truncate_log.inc
3535
=== modified file 'plugin/filtered_replicator/tests/t/var_schemaregex.test'
--- plugin/filtered_replicator/tests/t/var_schemaregex.test 2011-01-21 22:51:18 +0000
+++ plugin/filtered_replicator/tests/t/var_schemaregex.test 2011-04-01 20:13:32 +0000
@@ -22,6 +22,6 @@
22--echo We should only see the 'bar' schema in the log22--echo We should only see the 'bar' schema in the log
23--echo23--echo
24--replace_result $DRIZZLETEST_VARDIR VARDIR24--replace_result $DRIZZLETEST_VARDIR VARDIR
25--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log25--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2626
27--source ../plugin/transaction_log/tests/t/truncate_log.inc27--source ../plugin/transaction_log/tests/t/truncate_log.inc
2828
=== modified file 'plugin/filtered_replicator/tests/t/var_tableregex.test'
--- plugin/filtered_replicator/tests/t/var_tableregex.test 2011-01-21 22:51:18 +0000
+++ plugin/filtered_replicator/tests/t/var_tableregex.test 2011-04-01 20:13:32 +0000
@@ -32,6 +32,6 @@
32--echo32--echo
33--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/33--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/
3434
35--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log35--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
3636
37--source ../plugin/transaction_log/tests/t/truncate_log.inc37--source ../plugin/transaction_log/tests/t/truncate_log.inc
3838
=== modified file 'plugin/storage_engine_api_tester/tests/t/txn_log_insert.test'
--- plugin/storage_engine_api_tester/tests/t/txn_log_insert.test 2011-01-26 04:34:48 +0000
+++ plugin/storage_engine_api_tester/tests/t/txn_log_insert.test 2011-04-01 20:13:32 +0000
@@ -54,7 +54,7 @@
54select seapitester_clear_engine_state_history();54select seapitester_clear_engine_state_history();
5555
56--replace_result $DRIZZLETEST_VARDIR VARDIR56--replace_result $DRIZZLETEST_VARDIR VARDIR
57--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log57--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
5858
59# Truncate the log file to reset for the next test59# Truncate the log file to reset for the next test
60--source ../plugin/transaction_log/tests/t/truncate_log.inc60--source ../plugin/transaction_log/tests/t/truncate_log.inc
6161
=== modified file 'plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test'
--- plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test 2011-01-26 04:34:48 +0000
+++ plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test 2011-04-01 20:13:32 +0000
@@ -52,7 +52,7 @@
52select seapitester_clear_engine_state_history();52select seapitester_clear_engine_state_history();
5353
54--replace_result $DRIZZLETEST_VARDIR VARDIR54--replace_result $DRIZZLETEST_VARDIR VARDIR
55--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log55--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
5656
57# Truncate the log file to reset for the next test57# Truncate the log file to reset for the next test
58--source ../plugin/transaction_log/tests/t/truncate_log.inc58--source ../plugin/transaction_log/tests/t/truncate_log.inc
5959
=== modified file 'plugin/transaction_log/plugin.am'
--- plugin/transaction_log/plugin.am 2010-11-28 03:12:49 +0000
+++ plugin/transaction_log/plugin.am 2011-04-01 20:13:32 +0000
@@ -16,7 +16,7 @@
1616
1717
18if BUILD_TRANSACTION_LOG_PLUGIN18if BUILD_TRANSACTION_LOG_PLUGIN
19noinst_PROGRAMS += plugin/transaction_log/utilities/transaction_reader19bin_PROGRAMS += plugin/transaction_log/utilities/drizzletrx
20endif20endif
2121
22noinst_HEADERS += \22noinst_HEADERS += \
@@ -24,13 +24,13 @@
24 plugin/transaction_log/utilities/transaction_manager.h \24 plugin/transaction_log/utilities/transaction_manager.h \
25 plugin/transaction_log/utilities/transaction_log_connection.h25 plugin/transaction_log/utilities/transaction_log_connection.h
2626
27plugin_transaction_log_utilities_transaction_reader_SOURCES = \27plugin_transaction_log_utilities_drizzletrx_SOURCES = \
28 plugin/transaction_log/utilities/transaction_reader.cc \28 plugin/transaction_log/utilities/transaction_reader.cc \
29 plugin/transaction_log/utilities/transaction_file_reader.cc \29 plugin/transaction_log/utilities/transaction_file_reader.cc \
30 plugin/transaction_log/utilities/transaction_manager.cc \30 plugin/transaction_log/utilities/transaction_manager.cc \
31 plugin/transaction_log/utilities/transaction_log_connection.cc31 plugin/transaction_log/utilities/transaction_log_connection.cc
3232
33plugin_transaction_log_utilities_transaction_reader_LDADD = \33plugin_transaction_log_utilities_drizzletrx_LDADD = \
34 $(top_builddir)/drizzled/message/libdrizzledmessage.la \34 $(top_builddir)/drizzled/message/libdrizzledmessage.la \
35 ${top_builddir}/drizzled/internal/libinternal.la \35 ${top_builddir}/drizzled/internal/libinternal.la \
36 ${top_builddir}/drizzled/algorithm/libhash.la \36 ${top_builddir}/drizzled/algorithm/libhash.la \
@@ -41,4 +41,4 @@
41 ${LTLIBINTL} \41 ${LTLIBINTL} \
42 $(GCOV_LIBS)42 $(GCOV_LIBS)
4343
44plugin_transaction_log_utilities_transaction_reader_CXXFLAGS = ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS} ${NO_WERROR}44plugin_transaction_log_utilities_drizzletrx_CXXFLAGS = ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS} ${NO_WERROR}
4545
=== modified file 'plugin/transaction_log/tests/t/alter.test'
--- plugin/transaction_log/tests/t/alter.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/alter.test 2011-04-01 20:13:32 +0000
@@ -17,11 +17,11 @@
1717
18# Read in the transaction.log.18# Read in the transaction.log.
19--replace_result $DRIZZLETEST_VARDIR VARDIR19--replace_result $DRIZZLETEST_VARDIR VARDIR
20--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log20--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2121
22--echo22--echo
23--echo Generating statements for innodb replication log23--echo Generating statements for innodb replication log
24--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events24--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2525
26# Truncate the log file to reset for the next test26# Truncate the log file to reset for the next test
27--source ../plugin/transaction_log/tests/t/truncate_log.inc27--source ../plugin/transaction_log/tests/t/truncate_log.inc
2828
=== modified file 'plugin/transaction_log/tests/t/alter_schema.test'
--- plugin/transaction_log/tests/t/alter_schema.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/alter_schema.test 2011-04-01 20:13:32 +0000
@@ -10,7 +10,7 @@
1010
11--echo11--echo
12--replace_result $DRIZZLETEST_VARDIR VARDIR12--replace_result $DRIZZLETEST_VARDIR VARDIR
13--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log13--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1414
15--disable_query_log15--disable_query_log
16DROP SCHEMA alter_schema_test;16DROP SCHEMA alter_schema_test;
1717
=== modified file 'plugin/transaction_log/tests/t/auto_commit.test'
--- plugin/transaction_log/tests/t/auto_commit.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/auto_commit.test 2011-04-01 20:13:32 +0000
@@ -18,11 +18,11 @@
18# Read in the transaction.log.18# Read in the transaction.log.
1919
20--replace_result $DRIZZLETEST_VARDIR VARDIR20--replace_result $DRIZZLETEST_VARDIR VARDIR
21--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log21--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2222
23--echo23--echo
24--echo Generating statements for innodb replication log24--echo Generating statements for innodb replication log
25--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events25--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2626
27# Truncate the log file to reset for the next test27# Truncate the log file to reset for the next test
28--source ../plugin/transaction_log/tests/t/truncate_log.inc28--source ../plugin/transaction_log/tests/t/truncate_log.inc
2929
=== modified file 'plugin/transaction_log/tests/t/blob.test'
--- plugin/transaction_log/tests/t/blob.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/blob.test 2011-04-01 20:13:32 +0000
@@ -19,11 +19,11 @@
19# Read in the transaction.log.19# Read in the transaction.log.
2020
21--replace_result $DRIZZLETEST_VARDIR VARDIR21--replace_result $DRIZZLETEST_VARDIR VARDIR
22--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log22--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2323
24--echo24--echo
25--echo Generating statements for innodb replication log25--echo Generating statements for innodb replication log
26--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events26--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2727
28# Truncate the log file to reset for the next test28# Truncate the log file to reset for the next test
29--source ../plugin/transaction_log/tests/t/truncate_log.inc29--source ../plugin/transaction_log/tests/t/truncate_log.inc
3030
=== modified file 'plugin/transaction_log/tests/t/create_select.test'
--- plugin/transaction_log/tests/t/create_select.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/create_select.test 2011-04-01 20:13:32 +0000
@@ -15,11 +15,11 @@
15# Read in the transaction.log.15# Read in the transaction.log.
1616
17--replace_result $DRIZZLETEST_VARDIR VARDIR17--replace_result $DRIZZLETEST_VARDIR VARDIR
18--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log18--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1919
20--echo20--echo
21--echo Generating statements for innodb replication log21--echo Generating statements for innodb replication log
22--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events22--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2323
24# Truncate the log file to reset for the next test24# Truncate the log file to reset for the next test
25--source ../plugin/transaction_log/tests/t/truncate_log.inc25--source ../plugin/transaction_log/tests/t/truncate_log.inc
2626
=== modified file 'plugin/transaction_log/tests/t/create_table.test'
--- plugin/transaction_log/tests/t/create_table.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/create_table.test 2011-04-01 20:13:32 +0000
@@ -15,11 +15,11 @@
15# Read in the transaction.log.15# Read in the transaction.log.
1616
17--replace_result $DRIZZLETEST_VARDIR VARDIR17--replace_result $DRIZZLETEST_VARDIR VARDIR
18--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log18--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1919
20--echo20--echo
21--echo Generating statements for innodb replication log21--echo Generating statements for innodb replication log
22--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events22--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2323
24# Truncate the log file to reset for the next test24# Truncate the log file to reset for the next test
25--source ../plugin/transaction_log/tests/t/truncate_log.inc25--source ../plugin/transaction_log/tests/t/truncate_log.inc
2626
=== modified file 'plugin/transaction_log/tests/t/delete.test'
--- plugin/transaction_log/tests/t/delete.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/delete.test 2011-04-01 20:13:32 +0000
@@ -19,11 +19,11 @@
19# Read in the transaction.log.19# Read in the transaction.log.
2020
21--replace_result $DRIZZLETEST_VARDIR VARDIR21--replace_result $DRIZZLETEST_VARDIR VARDIR
22--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log22--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2323
24--echo24--echo
25--echo Generating statements for innodb replication log25--echo Generating statements for innodb replication log
26--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events26--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2727
28# Truncate the log file to reset for the next test28# Truncate the log file to reset for the next test
29--source ../plugin/transaction_log/tests/t/truncate_log.inc29--source ../plugin/transaction_log/tests/t/truncate_log.inc
3030
=== modified file 'plugin/transaction_log/tests/t/embedded_quotes.test'
--- plugin/transaction_log/tests/t/embedded_quotes.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/embedded_quotes.test 2011-04-01 20:13:32 +0000
@@ -14,7 +14,7 @@
14# Read in the transaction.log.14# Read in the transaction.log.
1515
16--replace_result $DRIZZLETEST_VARDIR VARDIR16--replace_result $DRIZZLETEST_VARDIR VARDIR
17--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log17--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1818
19DROP TABLE t;19DROP TABLE t;
2020
2121
=== modified file 'plugin/transaction_log/tests/t/insert.test'
--- plugin/transaction_log/tests/t/insert.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/insert.test 2011-04-01 20:13:32 +0000
@@ -19,11 +19,11 @@
19# Read in the transaction.log.19# Read in the transaction.log.
2020
21--replace_result $DRIZZLETEST_VARDIR VARDIR21--replace_result $DRIZZLETEST_VARDIR VARDIR
22--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log22--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2323
24--echo24--echo
25--echo Generating statements for innodb replication log25--echo Generating statements for innodb replication log
26--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events26--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2727
28# Truncate the log file to reset for the next test28# Truncate the log file to reset for the next test
29--source ../plugin/transaction_log/tests/t/truncate_log.inc29--source ../plugin/transaction_log/tests/t/truncate_log.inc
3030
=== modified file 'plugin/transaction_log/tests/t/insert_multi.test'
--- plugin/transaction_log/tests/t/insert_multi.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/insert_multi.test 2011-04-01 20:13:32 +0000
@@ -19,11 +19,11 @@
19# Read in the transaction.log.19# Read in the transaction.log.
2020
21--replace_result $DRIZZLETEST_VARDIR VARDIR21--replace_result $DRIZZLETEST_VARDIR VARDIR
22--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log22--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2323
24--echo24--echo
25--echo Generating statements for innodb replication log25--echo Generating statements for innodb replication log
26--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events26--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2727
28# Truncate the log file to reset for the next test28# Truncate the log file to reset for the next test
29--source ../plugin/transaction_log/tests/t/truncate_log.inc29--source ../plugin/transaction_log/tests/t/truncate_log.inc
3030
=== modified file 'plugin/transaction_log/tests/t/insert_on_duplicate_update.test'
--- plugin/transaction_log/tests/t/insert_on_duplicate_update.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/insert_on_duplicate_update.test 2011-04-01 20:13:32 +0000
@@ -18,11 +18,11 @@
18# Read in the transaction.log.18# Read in the transaction.log.
1919
20--replace_result $DRIZZLETEST_VARDIR VARDIR20--replace_result $DRIZZLETEST_VARDIR VARDIR
21--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log21--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2222
23--echo23--echo
24--echo Generating statements for innodb replication log24--echo Generating statements for innodb replication log
25--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events25--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2626
27# Truncate the log file to reset for the next test27# Truncate the log file to reset for the next test
28--source ../plugin/transaction_log/tests/t/truncate_log.inc28--source ../plugin/transaction_log/tests/t/truncate_log.inc
2929
=== modified file 'plugin/transaction_log/tests/t/insert_select.test'
--- plugin/transaction_log/tests/t/insert_select.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/insert_select.test 2011-04-01 20:13:32 +0000
@@ -19,11 +19,11 @@
19# Read in the transaction.log.19# Read in the transaction.log.
2020
21--replace_result $DRIZZLETEST_VARDIR VARDIR21--replace_result $DRIZZLETEST_VARDIR VARDIR
22--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log22--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2323
24--echo24--echo
25--echo Generating statements for innodb replication log25--echo Generating statements for innodb replication log
26--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events26--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2727
28# Truncate the log file to reset for the next test28# Truncate the log file to reset for the next test
29--source ../plugin/transaction_log/tests/t/truncate_log.inc29--source ../plugin/transaction_log/tests/t/truncate_log.inc
3030
=== modified file 'plugin/transaction_log/tests/t/multi_column_primary_key.test'
--- plugin/transaction_log/tests/t/multi_column_primary_key.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/multi_column_primary_key.test 2011-04-01 20:13:32 +0000
@@ -15,11 +15,11 @@
15# Read in the transaction.log.15# Read in the transaction.log.
1616
17--replace_result $DRIZZLETEST_VARDIR VARDIR17--replace_result $DRIZZLETEST_VARDIR VARDIR
18--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log18--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1919
20--echo20--echo
21--echo Generating statements for innodb replication log21--echo Generating statements for innodb replication log
22--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events22--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2323
24# Truncate the log file to reset for the next test24# Truncate the log file to reset for the next test
25--source ../plugin/transaction_log/tests/t/truncate_log.inc25--source ../plugin/transaction_log/tests/t/truncate_log.inc
2626
=== modified file 'plugin/transaction_log/tests/t/multi_table.test'
--- plugin/transaction_log/tests/t/multi_table.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/multi_table.test 2011-04-01 20:13:32 +0000
@@ -19,11 +19,11 @@
19# Read in the transaction.log.19# Read in the transaction.log.
2020
21--replace_result $DRIZZLETEST_VARDIR VARDIR21--replace_result $DRIZZLETEST_VARDIR VARDIR
22--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log22--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2323
24--echo24--echo
25--echo Generating statements for innodb replication log25--echo Generating statements for innodb replication log
26--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events26--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2727
28# Truncate the log file to reset for the next test28# Truncate the log file to reset for the next test
29--source ../plugin/transaction_log/tests/t/truncate_log.inc29--source ../plugin/transaction_log/tests/t/truncate_log.inc
3030
=== modified file 'plugin/transaction_log/tests/t/no_modification.test'
--- plugin/transaction_log/tests/t/no_modification.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/no_modification.test 2011-04-01 20:13:32 +0000
@@ -19,11 +19,11 @@
19# Read in the transaction.log.19# Read in the transaction.log.
2020
21--replace_result $DRIZZLETEST_VARDIR VARDIR21--replace_result $DRIZZLETEST_VARDIR VARDIR
22--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log22--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2323
24--echo24--echo
25--echo Generating statements for innodb replication log25--echo Generating statements for innodb replication log
26--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events26--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2727
28# Truncate the log file to reset for the next test28# Truncate the log file to reset for the next test
29--source ../plugin/transaction_log/tests/t/truncate_log.inc29--source ../plugin/transaction_log/tests/t/truncate_log.inc
3030
=== modified file 'plugin/transaction_log/tests/t/no_primary_key.test'
--- plugin/transaction_log/tests/t/no_primary_key.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/no_primary_key.test 2011-04-01 20:13:32 +0000
@@ -20,11 +20,11 @@
20# Read in the transaction.log.20# Read in the transaction.log.
2121
22--replace_result $DRIZZLETEST_VARDIR VARDIR22--replace_result $DRIZZLETEST_VARDIR VARDIR
23--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log23--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2424
25--echo25--echo
26--echo Generating statements for innodb replication log26--echo Generating statements for innodb replication log
27--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events27--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2828
29# Truncate the log file to reset for the next test29# Truncate the log file to reset for the next test
30--source ../plugin/transaction_log/tests/t/truncate_log.inc30--source ../plugin/transaction_log/tests/t/truncate_log.inc
3131
=== modified file 'plugin/transaction_log/tests/t/null_values.test'
--- plugin/transaction_log/tests/t/null_values.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/null_values.test 2011-04-01 20:13:32 +0000
@@ -19,11 +19,11 @@
19# Read in the transaction.log.19# Read in the transaction.log.
2020
21--replace_result $DRIZZLETEST_VARDIR VARDIR21--replace_result $DRIZZLETEST_VARDIR VARDIR
22--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log22--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2323
24--echo24--echo
25--echo Generating statements for innodb replication log25--echo Generating statements for innodb replication log
26--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events26--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2727
28# Truncate the log file to reset for the next test28# Truncate the log file to reset for the next test
29--source ../plugin/transaction_log/tests/t/truncate_log.inc29--source ../plugin/transaction_log/tests/t/truncate_log.inc
3030
=== modified file 'plugin/transaction_log/tests/t/rand.test'
--- plugin/transaction_log/tests/t/rand.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/rand.test 2011-04-01 20:13:32 +0000
@@ -15,11 +15,11 @@
15# Read in the transaction.log.15# Read in the transaction.log.
1616
17--replace_result $DRIZZLETEST_VARDIR VARDIR17--replace_result $DRIZZLETEST_VARDIR VARDIR
18--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log18--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1919
20--echo20--echo
21--echo Generating statements for innodb replication log21--echo Generating statements for innodb replication log
22--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events22--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2323
24# Truncate the log file to reset for the next test24# Truncate the log file to reset for the next test
25--source ../plugin/transaction_log/tests/t/truncate_log.inc25--source ../plugin/transaction_log/tests/t/truncate_log.inc
2626
=== modified file 'plugin/transaction_log/tests/t/rename.test'
--- plugin/transaction_log/tests/t/rename.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/rename.test 2011-04-01 20:13:32 +0000
@@ -19,11 +19,11 @@
19# Read in the transaction.log.19# Read in the transaction.log.
2020
21--replace_result $DRIZZLETEST_VARDIR VARDIR21--replace_result $DRIZZLETEST_VARDIR VARDIR
22--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log22--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2323
24--echo24--echo
25--echo Generating statements for innodb replication log25--echo Generating statements for innodb replication log
26--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events26--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2727
28# Truncate the log file to reset for the next test28# Truncate the log file to reset for the next test
29--source ../plugin/transaction_log/tests/t/truncate_log.inc29--source ../plugin/transaction_log/tests/t/truncate_log.inc
3030
=== modified file 'plugin/transaction_log/tests/t/replace.test'
--- plugin/transaction_log/tests/t/replace.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/replace.test 2011-04-01 20:13:32 +0000
@@ -20,11 +20,11 @@
20# Read in the transaction.log.20# Read in the transaction.log.
2121
22--replace_result $DRIZZLETEST_VARDIR VARDIR22--replace_result $DRIZZLETEST_VARDIR VARDIR
23--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log23--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2424
25--echo25--echo
26--echo Generating statements for innodb replication log26--echo Generating statements for innodb replication log
27--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events27--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2828
29# Truncate the log file to reset for the next test29# Truncate the log file to reset for the next test
30--source ../plugin/transaction_log/tests/t/truncate_log.inc30--source ../plugin/transaction_log/tests/t/truncate_log.inc
3131
=== modified file 'plugin/transaction_log/tests/t/rollback.test'
--- plugin/transaction_log/tests/t/rollback.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/rollback.test 2011-04-01 20:13:32 +0000
@@ -20,11 +20,11 @@
20# Read in the transaction.log.20# Read in the transaction.log.
2121
22--replace_result $DRIZZLETEST_VARDIR VARDIR22--replace_result $DRIZZLETEST_VARDIR VARDIR
23--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log23--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2424
25--echo25--echo
26--echo Generating statements for innodb replication log26--echo Generating statements for innodb replication log
27--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events27--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2828
29# Truncate the log file to reset for the next test29# Truncate the log file to reset for the next test
30--source ../plugin/transaction_log/tests/t/truncate_log.inc30--source ../plugin/transaction_log/tests/t/truncate_log.inc
3131
=== modified file 'plugin/transaction_log/tests/t/rollback_statement.test'
--- plugin/transaction_log/tests/t/rollback_statement.test 2011-01-26 04:34:48 +0000
+++ plugin/transaction_log/tests/t/rollback_statement.test 2011-04-01 20:13:32 +0000
@@ -45,11 +45,11 @@
4545
46--echo46--echo
47--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/47--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/
48--exec ../plugin/transaction_log/utilities/transaction_reader --raw $DRIZZLETEST_VARDIR/master-data/local/transaction.log48--exec $DRIZZLE_TRX_READER --raw $DRIZZLETEST_VARDIR/master-data/local/transaction.log
4949
50--echo50--echo
51--replace_result $DRIZZLETEST_VARDIR VARDIR51--replace_result $DRIZZLETEST_VARDIR VARDIR
52--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log52--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
5353
54--disable_query_log54--disable_query_log
55DROP TABLE src;55DROP TABLE src;
5656
=== modified file 'plugin/transaction_log/tests/t/schema.test'
--- plugin/transaction_log/tests/t/schema.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/schema.test 2011-04-01 20:13:32 +0000
@@ -15,11 +15,11 @@
15# Read in the transaction.log.15# Read in the transaction.log.
1616
17--replace_result $DRIZZLETEST_VARDIR VARDIR17--replace_result $DRIZZLETEST_VARDIR VARDIR
18--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log18--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1919
20--echo20--echo
21--echo Generating statements for innodb replication log21--echo Generating statements for innodb replication log
22--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events22--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2323
24# Truncate the log file to reset for the next test24# Truncate the log file to reset for the next test
25--source ../plugin/transaction_log/tests/t/truncate_log.inc25--source ../plugin/transaction_log/tests/t/truncate_log.inc
2626
=== modified file 'plugin/transaction_log/tests/t/select_for_update.test'
--- plugin/transaction_log/tests/t/select_for_update.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/select_for_update.test 2011-04-01 20:13:32 +0000
@@ -20,11 +20,11 @@
20# Read in the transaction.log.20# Read in the transaction.log.
2121
22--replace_result $DRIZZLETEST_VARDIR VARDIR22--replace_result $DRIZZLETEST_VARDIR VARDIR
23--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log23--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2424
25--echo25--echo
26--echo Generating statements for innodb replication log26--echo Generating statements for innodb replication log
27--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events27--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2828
29# Truncate the log file to reset for the next test29# Truncate the log file to reset for the next test
30--source ../plugin/transaction_log/tests/t/truncate_log.inc30--source ../plugin/transaction_log/tests/t/truncate_log.inc
3131
=== modified file 'plugin/transaction_log/tests/t/temp_tables.test'
--- plugin/transaction_log/tests/t/temp_tables.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/temp_tables.test 2011-04-01 20:13:32 +0000
@@ -7,7 +7,7 @@
77
8# Read in the transaction.log.8# Read in the transaction.log.
9--replace_result $DRIZZLETEST_VARDIR VARDIR9--replace_result $DRIZZLETEST_VARDIR VARDIR
10--exec ../plugin/transaction_log/utilities/transaction_reader --ignore-events $DRIZZLETEST_VARDIR/master-data/local/transaction.log10--exec $DRIZZLE_TRX_READER --ignore-events $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1111
12# Truncate the log file to reset for the next test12# Truncate the log file to reset for the next test
13--source ../plugin/transaction_log/tests/t/truncate_log.inc13--source ../plugin/transaction_log/tests/t/truncate_log.inc
1414
=== modified file 'plugin/transaction_log/tests/t/truncate.test'
--- plugin/transaction_log/tests/t/truncate.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/truncate.test 2011-04-01 20:13:32 +0000
@@ -13,7 +13,7 @@
13# Read in the transaction.log.13# Read in the transaction.log.
1414
15--replace_result $DRIZZLETEST_VARDIR VARDIR15--replace_result $DRIZZLETEST_VARDIR VARDIR
16--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log16--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1717
18# Truncate the log file to reset for the next test18# Truncate the log file to reset for the next test
19--source ../plugin/transaction_log/tests/t/truncate_log.inc19--source ../plugin/transaction_log/tests/t/truncate_log.inc
2020
=== modified file 'plugin/transaction_log/tests/t/update.test'
--- plugin/transaction_log/tests/t/update.test 2011-01-21 22:24:55 +0000
+++ plugin/transaction_log/tests/t/update.test 2011-04-01 20:13:32 +0000
@@ -19,11 +19,11 @@
19# Read in the transaction.log.19# Read in the transaction.log.
2020
21--replace_result $DRIZZLETEST_VARDIR VARDIR21--replace_result $DRIZZLETEST_VARDIR VARDIR
22--exec ../plugin/transaction_log/utilities/transaction_reader $DRIZZLETEST_VARDIR/master-data/local/transaction.log22--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
2323
24--echo24--echo
25--echo Generating statements for innodb replication log25--echo Generating statements for innodb replication log
26--exec ../plugin/transaction_log/utilities/transaction_reader --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events26--exec $DRIZZLE_TRX_READER --use-innodb-replication-log -p $MASTER_MYPORT --start-transaction-id $max_transaction_id --ignore-events
2727
28# Truncate the log file to reset for the next test28# Truncate the log file to reset for the next test
29--source ../plugin/transaction_log/tests/t/truncate_log.inc29--source ../plugin/transaction_log/tests/t/truncate_log.inc
3030
=== modified file 'tests/lib/drizzle_test_run/dtr_test_execution.py'
--- tests/lib/drizzle_test_run/dtr_test_execution.py 2011-03-10 19:25:03 +0000
+++ tests/lib/drizzle_test_run/dtr_test_execution.py 2011-04-01 20:13:32 +0000
@@ -183,6 +183,7 @@
183 , self.master_server.master_port)183 , self.master_server.master_port)
184 , 'DRIZZLE_ADMIN' : "%s -uroot -p%d" %( self.master_server.drizzleadmin184 , 'DRIZZLE_ADMIN' : "%s -uroot -p%d" %( self.master_server.drizzleadmin
185 , self.master_server.master_port)185 , self.master_server.master_port)
186 , 'DRIZZLE_TRX_READER' : self.system_manager.code_tree.drizzle_trx_reader
186 } 187 }
187188
188 self.working_environment = self.system_manager.create_working_environment(env_reqs)189 self.working_environment = self.system_manager.create_working_environment(env_reqs)
189190
=== modified file 'tests/lib/randgen/randgen_test_execution.py'
--- tests/lib/randgen/randgen_test_execution.py 2011-03-10 19:25:03 +0000
+++ tests/lib/randgen/randgen_test_execution.py 2011-04-01 20:13:32 +0000
@@ -152,7 +152,8 @@
152 , self.master_server.master_port)152 , self.master_server.master_port)
153 , 'DRIZZLE_ADMIN' : "%s -uroot -p%d" %( self.master_server.drizzleadmin153 , 'DRIZZLE_ADMIN' : "%s -uroot -p%d" %( self.master_server.drizzleadmin
154 , self.master_server.master_port)154 , self.master_server.master_port)
155 , 'DRIZZLE_BASEDIR' : "%s" %(self.system_manager.code_tree.basedir)155 , 'DRIZZLE_BASEDIR' : self.system_manager.code_tree.basedir
156 , 'DRIZZLE_TRX_READER' : self.system_manager.code_tree.drizzle_trx_reader
156 } 157 }
157158
158159
159160
=== modified file 'tests/lib/sys_mgmt/codeTree.py'
--- tests/lib/sys_mgmt/codeTree.py 2011-03-13 21:01:10 +0000
+++ tests/lib/sys_mgmt/codeTree.py 2011-04-01 20:13:32 +0000
@@ -103,6 +103,9 @@
103 self.drizzletest = self.system_manager.find_path([os.path.join(self.clientbindir,103 self.drizzletest = self.system_manager.find_path([os.path.join(self.clientbindir,
104 'drizzletest')])104 'drizzletest')])
105105
106 self.drizzle_trx_reader = self.system_manager.find_path([os.path.join(self.basedir,
107 'plugin/transaction_log/utilities/drizzletrx')])
108
106 self.server_version_string = None109 self.server_version_string = None
107 self.server_executable = None110 self.server_executable = None
108 self.server_version = None111 self.server_version = None
109112
=== modified file 'tests/test-run.pl'
--- tests/test-run.pl 2011-03-10 19:25:03 +0000
+++ tests/test-run.pl 2011-04-01 20:13:32 +0000
@@ -1503,6 +1503,7 @@
1503 $ENV{'PBMS_PORT'}= $opt_pbms_myport;1503 $ENV{'PBMS_PORT'}= $opt_pbms_myport;
1504 $ENV{'RABBITMQ_NODE_PORT'}= $opt_rabbitmq_myport;1504 $ENV{'RABBITMQ_NODE_PORT'}= $opt_rabbitmq_myport;
1505 $ENV{'DRIZZLE_TCP_PORT'}= $drizzled_variables{'drizzle-protocol.port'};1505 $ENV{'DRIZZLE_TCP_PORT'}= $drizzled_variables{'drizzle-protocol.port'};
1506 $ENV{'DRIZZLE_TRX_READER'} = $opt_top_builddir.'/plugin/transaction_log/utilities/drizzletrx';
15061507
1507 $ENV{'DTR_BUILD_THREAD'}= $opt_dtr_build_thread;1508 $ENV{'DTR_BUILD_THREAD'}= $opt_dtr_build_thread;
15081509

Subscribers

People subscribed via source and target branches