Merge lp://qastaging/~linuxjedi/drizzle/trunk-bug-725238 into lp://qastaging/drizzle/7.0
Proposed by
Andrew Hutchings
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Brian Aker | ||||
| Approved revision: | 2212 | ||||
| Merged at revision: | 2215 | ||||
| Proposed branch: | lp://qastaging/~linuxjedi/drizzle/trunk-bug-725238 | ||||
| Merge into: | lp://qastaging/drizzle/7.0 | ||||
| Diff against target: |
371 lines (+43/-43) 43 files modified
docs/testing/randgen.rst (+1/-1) plugin/innobase/docs/index.rst (+1/-1) plugin/innobase/handler/ha_innodb.cc (+1/-1) plugin/innobase/tests/t/innodb_replication_log-master.opt (+1/-1) plugin/slave/docs/index.rst (+1/-1) plugin/transaction_log/tests/t/alter-master.opt (+1/-1) plugin/transaction_log/tests/t/auto_commit-master.opt (+1/-1) plugin/transaction_log/tests/t/blob-master.opt (+1/-1) plugin/transaction_log/tests/t/create_select-master.opt (+1/-1) plugin/transaction_log/tests/t/create_table-master.opt (+1/-1) plugin/transaction_log/tests/t/delete-master.opt (+1/-1) plugin/transaction_log/tests/t/insert-master.opt (+1/-1) plugin/transaction_log/tests/t/insert_multi-master.opt (+1/-1) plugin/transaction_log/tests/t/insert_on_duplicate_update-master.opt (+1/-1) plugin/transaction_log/tests/t/insert_select-master.opt (+1/-1) plugin/transaction_log/tests/t/multi_column_primary_key-master.opt (+1/-1) plugin/transaction_log/tests/t/multi_table-master.opt (+1/-1) plugin/transaction_log/tests/t/no_modification-master.opt (+1/-1) plugin/transaction_log/tests/t/no_primary_key-master.opt (+1/-1) plugin/transaction_log/tests/t/null_values-master.opt (+1/-1) plugin/transaction_log/tests/t/rand-master.opt (+1/-1) plugin/transaction_log/tests/t/rename-master.opt (+1/-1) plugin/transaction_log/tests/t/replace-master.opt (+1/-1) plugin/transaction_log/tests/t/rollback-master.opt (+1/-1) plugin/transaction_log/tests/t/schema-master.opt (+1/-1) plugin/transaction_log/tests/t/select_for_update-master.opt (+1/-1) plugin/transaction_log/tests/t/update-master.opt (+1/-1) tests/randgen_tests/innodb_trx_log/multi_thread1.cnf (+1/-1) tests/randgen_tests/innodb_trx_log/multi_thread1_mix.cnf (+1/-1) tests/randgen_tests/innodb_trx_log/multi_thread2.cnf (+1/-1) tests/randgen_tests/innodb_trx_log/multi_thread2_mix.cnf (+1/-1) tests/randgen_tests/innodb_trx_log/multi_thread3.cnf (+1/-1) tests/randgen_tests/innodb_trx_log/multi_thread3_mix.cnf (+1/-1) tests/randgen_tests/innodb_trx_log/single_thread3.cnf (+1/-1) tests/randgen_tests/innodb_trx_log/trx_ordering.cnf (+1/-1) tests/randgen_tests/slave_plugin/multi_thread1.cnf (+1/-1) tests/randgen_tests/slave_plugin/multi_thread1_mix.cnf (+1/-1) tests/randgen_tests/slave_plugin/multi_thread2.cnf (+1/-1) tests/randgen_tests/slave_plugin/multi_thread2_mix.cnf (+1/-1) tests/randgen_tests/slave_plugin/multi_thread3.cnf (+1/-1) tests/randgen_tests/slave_plugin/multi_thread3_mix.cnf (+1/-1) tests/randgen_tests/slave_plugin/single_thread3.cnf (+1/-1) tests/randgen_tests/slave_plugin/trx_ordering.cnf (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~linuxjedi/drizzle/trunk-bug-725238 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Add zero_tokens() to --innodb.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
