Merge lp:~vjsamuel/drizzle/modify-opt-files into lp:~drizzle-trunk/drizzle/development

Proposed by Vijay Samuel
Status: Merged
Approved by: Monty Taylor
Approved revision: 1724
Merged at revision: 1727
Proposed branch: lp:~vjsamuel/drizzle/modify-opt-files
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 1464 lines (+204/-202)
205 files modified
client/client_priv.h (+0/-1)
client/drizzle.cc (+1/-0)
client/drizzledump.cc (+1/-0)
client/drizzleslap.cc (+1/-0)
client/drizzletest.cc (+2/-1)
plugin/archive/archive_reader.cc (+0/-1)
plugin/archive/tests/t/archive-master.opt (+1/-1)
plugin/blackhole/tests/t/blackhole-master.opt (+1/-1)
plugin/blitzdb/tests/t/master.opt (+1/-1)
plugin/crc32/tests/t/crc32-master.opt (+1/-1)
plugin/csv/tests/t/master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alias-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_column_drop_default-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_database-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table_basic-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table_drop_temp-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment_neg_gaps-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_auto_increment-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_nullable-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_select-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_table-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_with_index-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_delete_all_rows-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_delete_row-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_drop_table-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_index_lookup-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_innodb_table_proto_table-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_innodb_truncate_table-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_multi_column-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_pkey_duplicate-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_nopkey_index_read-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_pkey_index_reverse_scan-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_pkey_index_scan-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_rename_table-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_savepoint-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_sec_index_prev-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update_pk_index-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_multirow-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_show_tables-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_statement_rollback-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction_autocommit-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction_rollback-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_type_decimal-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_update-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_with_indexes-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/bench_count_distinct-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/bool-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/comments-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_default-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_off-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_default-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_off-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_on-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_32m-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_addtl_mem_pool_size_default-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_42-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_default-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_22m-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_default-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_disable-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_enable-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown0-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown1-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown2-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_disable-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_enable-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_fsync-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odirect-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odsync-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_force_recovery-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_io_capacity-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lock_wait_timeout_1-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_5m-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_default-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_group_home_dir-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lru_block_access_recency-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lru_old_blocks_pct-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct_50-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag_42-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_800-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_default-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_off-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_on-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_off-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_on-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_status_file-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops_100-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_table_function-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_off-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_on-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct2-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct3-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/cursor_position-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/drizzleslap-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_length_limit-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_multicolumn_unique-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_null-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_prefix-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_varchar-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/insert_null-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_datadict_dump_func-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_version_func-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/plugin_load-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rename-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/replace-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rnd_pos-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format_file_per_table-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/secondary_index_scan-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/status_table_function-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/truncate-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_read_uncommitted-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_repeatable_read-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_serializable-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob_basic-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob_func-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_date-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_datetime-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_decimal-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_enum-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_float-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_timestamp-master.opt (+1/-1)
plugin/errmsg_notify/tests/t/notify-master.opt (+1/-1)
plugin/errmsg_stderr/tests/t/stderr-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/basic_create_table-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/basic_delete-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/basic_insert-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/basic_select-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/basic_update-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/multiple_update-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/rnd_pos-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/select_big_file-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/select_chop_line-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/select_cpuinfo-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/select_meminfo-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/select_separator_mode_weak-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/select_short_line-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/select_skip_blank_line-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/select_with_escaped_character-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/select_with_omit_field-master.opt (+1/-1)
plugin/filesystem_engine/tests/t/select_with_separators-master.opt (+1/-1)
plugin/hello_world/tests/t/hello_world-master.opt (+1/-1)
plugin/md5/tests/t/md5-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_auto_increment-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_create_nullable-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_create_select-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_create_table-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_create_with_index-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_delete_all_rows-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_delete_row-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_drop_table-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_index_lookup-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_innodb_truncate_table-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_insert-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_insert_multi_column-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_insert_pkey_duplicate-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_pkey_index_reverse_scan-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_pkey_index_scan-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_rename_table-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_savepoint-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_select-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_select_multirow-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_show_tables-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_statement_rollback-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_transaction-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_transaction_autocommit-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_transaction_rollback-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_type_decimal-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_update-master.opt (+1/-1)
plugin/pbxt/tests/t/basic_with_indexes-master.opt (+1/-1)
plugin/pool_of_threads/tests/t/pool_of_threads-master.opt (+1/-1)
plugin/single_thread/tests/t/single_thread-master.opt (+1/-1)
plugin/sleep/tests/t/sleep-master.opt (+1/-1)
plugin/tableprototester/tests/t/basic-master.opt (+1/-1)
plugin/tableprototester/tests/t/drop_table-master.opt (+1/-1)
plugin/tableprototester/tests/t/invalid_table_collation-master.opt (+1/-1)
plugin/tableprototester/tests/t/missing_engine-master.opt (+1/-1)
plugin/tableprototester/tests/t/too_many_enum_values-master.opt (+1/-1)
tests/t/subselect_notembedded-master.opt (+1/-1)
To merge this branch: bzr merge lp:~vjsamuel/drizzle/modify-opt-files
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+33298@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/client_priv.h'
2--- client/client_priv.h 2010-03-30 09:29:02 +0000
3+++ client/client_priv.h 2010-08-21 18:57:43 +0000
4@@ -19,7 +19,6 @@
5
6 #include "config.h"
7 #include <libdrizzle/drizzle_client.h>
8-#include "drizzled/option.h"
9 #include "drizzled/internal/my_sys.h"
10
11 #include "client/get_password.h"
12
13=== modified file 'client/drizzle.cc'
14--- client/drizzle.cc 2010-08-19 23:14:59 +0000
15+++ client/drizzle.cc 2010-08-21 18:57:43 +0000
16@@ -1,6 +1,7 @@
17 /* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
18 * vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
19 *
20+ * Copyright (C) 2010 Vijay Samuel
21 * Copyright (C) 2008 MySQL
22 *
23 * This program is free software; you can redistribute it and/or modify
24
25=== modified file 'client/drizzledump.cc'
26--- client/drizzledump.cc 2010-08-19 22:47:51 +0000
27+++ client/drizzledump.cc 2010-08-21 18:57:43 +0000
28@@ -1,4 +1,5 @@
29 /* Copyright 2000-2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
30+ * Copyright (C) 2010 Vijay Samuel
31
32 This program is free software; you can redistribute it and/or modify
33 it under the terms of the GNU General Public License as published by
34
35=== modified file 'client/drizzleslap.cc'
36--- client/drizzleslap.cc 2010-08-17 06:00:22 +0000
37+++ client/drizzleslap.cc 2010-08-21 18:57:43 +0000
38@@ -1,6 +1,7 @@
39 /* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
40 * vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
41 *
42+ * Copyright (C) 2010 Vijay Samuel
43 * Copyright (C) 2008 MySQL
44 *
45 * This program is free software; you can redistribute it and/or modify
46
47=== modified file 'client/drizzletest.cc'
48--- client/drizzletest.cc 2010-08-13 07:37:52 +0000
49+++ client/drizzletest.cc 2010-08-21 18:57:43 +0000
50@@ -1,6 +1,7 @@
51 /* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
52 * vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
53- *
54+ *
55+ * Copyright (C) 2010 Vijay Samuel
56 * Copyright (C) 2008 MySQL
57 *
58 * This program is free software; you can redistribute it and/or modify
59
60=== modified file 'plugin/archive/archive_reader.cc'
61--- plugin/archive/archive_reader.cc 2010-08-04 08:24:58 +0000
62+++ plugin/archive/archive_reader.cc 2010-08-21 18:57:43 +0000
63@@ -34,7 +34,6 @@
64 #include <fcntl.h>
65 #include "drizzled/charset_info.h"
66 #include "drizzled/internal/m_string.h"
67-#include "drizzled/option.h"
68
69 #define SHOW_VERSION "0.1"
70
71
72=== modified file 'plugin/archive/tests/t/archive-master.opt'
73--- plugin/archive/tests/t/archive-master.opt 2009-11-12 00:43:38 +0000
74+++ plugin/archive/tests/t/archive-master.opt 2010-08-21 18:57:43 +0000
75@@ -1,1 +1,1 @@
76---plugin_add=archive
77+--plugin-add=archive
78
79=== modified file 'plugin/blackhole/tests/t/blackhole-master.opt'
80--- plugin/blackhole/tests/t/blackhole-master.opt 2009-11-12 00:44:37 +0000
81+++ plugin/blackhole/tests/t/blackhole-master.opt 2010-08-21 18:57:43 +0000
82@@ -1,1 +1,1 @@
83---plugin_add=blackhole
84+--plugin-add=blackhole
85
86=== modified file 'plugin/blitzdb/tests/t/master.opt'
87--- plugin/blitzdb/tests/t/master.opt 2010-07-07 14:32:51 +0000
88+++ plugin/blitzdb/tests/t/master.opt 2010-08-21 18:57:43 +0000
89@@ -1,1 +1,1 @@
90---plugin_add=blitzdb
91+--plugin-add=blitzdb
92
93=== modified file 'plugin/crc32/tests/t/crc32-master.opt'
94--- plugin/crc32/tests/t/crc32-master.opt 2009-11-12 03:25:01 +0000
95+++ plugin/crc32/tests/t/crc32-master.opt 2010-08-21 18:57:43 +0000
96@@ -1,1 +1,1 @@
97---plugin_add=crc32
98+--plugin-add=crc32
99
100=== modified file 'plugin/csv/tests/t/master.opt'
101--- plugin/csv/tests/t/master.opt 2010-08-11 18:30:42 +0000
102+++ plugin/csv/tests/t/master.opt 2010-08-21 18:57:43 +0000
103@@ -1,1 +1,1 @@
104---plugin_add=csv
105+--plugin-add=csv
106
107=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alias-master.opt'
108--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alias-master.opt 2010-05-13 14:10:16 +0000
109+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alias-master.opt 2010-08-21 18:57:43 +0000
110@@ -1,1 +1,1 @@
111---plugin_add=embedded_innodb --plugin_remove=innobase
112+--plugin-add=embedded_innodb --plugin-remove=innobase
113
114=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_column_drop_default-master.opt'
115--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_column_drop_default-master.opt 2010-05-13 14:10:16 +0000
116+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_column_drop_default-master.opt 2010-08-21 18:57:43 +0000
117@@ -1,1 +1,1 @@
118---plugin_add=embedded_innodb --plugin_remove=innobase
119+--plugin-add=embedded_innodb --plugin-remove=innobase
120
121=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_database-master.opt'
122--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_database-master.opt 2010-06-09 04:31:50 +0000
123+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_database-master.opt 2010-08-21 18:57:43 +0000
124@@ -1,1 +1,1 @@
125---plugin_add=embedded_innodb --plugin_remove=innobase
126+--plugin-add=embedded_innodb --plugin-remove=innobase
127
128=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table-master.opt'
129--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table-master.opt 2010-06-09 04:13:00 +0000
130+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table-master.opt 2010-08-21 18:57:43 +0000
131@@ -1,1 +1,1 @@
132---plugin_add=embedded_innodb --plugin_remove=innobase
133+--plugin-add=embedded_innodb --plugin-remove=innobase
134
135=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table_basic-master.opt'
136--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table_basic-master.opt 2010-05-13 14:10:16 +0000
137+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table_basic-master.opt 2010-08-21 18:57:43 +0000
138@@ -1,1 +1,1 @@
139---plugin_add=embedded_innodb --plugin_remove=innobase
140+--plugin-add=embedded_innodb --plugin-remove=innobase
141
142=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table_drop_temp-master.opt'
143--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table_drop_temp-master.opt 2010-03-26 10:56:04 +0000
144+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table_drop_temp-master.opt 2010-08-21 18:57:43 +0000
145@@ -1,1 +1,1 @@
146---plugin_add=embedded_innodb --plugin_remove=innobase
147+--plugin-add=embedded_innodb --plugin-remove=innobase
148
149=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment-master.opt'
150--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment-master.opt 2010-03-26 10:29:14 +0000
151+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment-master.opt 2010-08-21 18:57:43 +0000
152@@ -1,1 +1,1 @@
153---plugin_add=embedded_innodb --plugin_remove=innobase
154+--plugin-add=embedded_innodb --plugin-remove=innobase
155
156=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment_neg_gaps-master.opt'
157--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment_neg_gaps-master.opt 2010-04-21 02:30:12 +0000
158+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment_neg_gaps-master.opt 2010-08-21 18:57:43 +0000
159@@ -1,1 +1,1 @@
160---plugin_add=embedded_innodb --plugin_remove=innobase
161+--plugin-add=embedded_innodb --plugin-remove=innobase
162
163=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_auto_increment-master.opt'
164--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_auto_increment-master.opt 2010-03-26 10:29:14 +0000
165+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_auto_increment-master.opt 2010-08-21 18:57:43 +0000
166@@ -1,1 +1,1 @@
167---plugin_add=embedded_innodb --plugin_remove=innobase
168+--plugin-add=embedded_innodb --plugin-remove=innobase
169
170=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_nullable-master.opt'
171--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_nullable-master.opt 2010-03-02 22:13:18 +0000
172+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_nullable-master.opt 2010-08-21 18:57:43 +0000
173@@ -1,1 +1,1 @@
174---plugin_add=embedded_innodb --plugin_remove=innobase
175+--plugin-add=embedded_innodb --plugin-remove=innobase
176
177=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_select-master.opt'
178--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_select-master.opt 2010-04-07 02:08:20 +0000
179+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_select-master.opt 2010-08-21 18:57:43 +0000
180@@ -1,1 +1,1 @@
181---plugin_add=embedded_innodb --plugin_remove=innobase
182+--plugin-add=embedded_innodb --plugin-remove=innobase
183
184=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_table-master.opt'
185--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_table-master.opt 2010-02-09 06:05:52 +0000
186+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_table-master.opt 2010-08-21 18:57:43 +0000
187@@ -1,1 +1,1 @@
188---plugin_add=embedded_innodb --plugin_remove=innobase
189+--plugin-add=embedded_innodb --plugin-remove=innobase
190
191=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_with_index-master.opt'
192--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_with_index-master.opt 2010-02-24 01:46:30 +0000
193+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_with_index-master.opt 2010-08-21 18:57:43 +0000
194@@ -1,1 +1,1 @@
195---plugin_add=embedded_innodb --plugin_remove=innobase
196+--plugin-add=embedded_innodb --plugin-remove=innobase
197
198=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_delete_all_rows-master.opt'
199--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_delete_all_rows-master.opt 2010-03-02 05:41:43 +0000
200+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_delete_all_rows-master.opt 2010-08-21 18:57:43 +0000
201@@ -1,1 +1,1 @@
202---plugin_add=embedded_innodb --plugin_remove=innobase
203+--plugin-add=embedded_innodb --plugin-remove=innobase
204
205=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_delete_row-master.opt'
206--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_delete_row-master.opt 2010-03-02 04:43:04 +0000
207+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_delete_row-master.opt 2010-08-21 18:57:43 +0000
208@@ -1,1 +1,1 @@
209---plugin_add=embedded_innodb --plugin_remove=innobase
210+--plugin-add=embedded_innodb --plugin-remove=innobase
211
212=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_drop_table-master.opt'
213--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_drop_table-master.opt 2010-02-12 03:35:17 +0000
214+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_drop_table-master.opt 2010-08-21 18:57:43 +0000
215@@ -1,1 +1,1 @@
216---plugin_add=embedded_innodb --plugin_remove=innobase
217+--plugin-add=embedded_innodb --plugin-remove=innobase
218
219=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_index_lookup-master.opt'
220--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_index_lookup-master.opt 2010-03-02 04:32:24 +0000
221+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_index_lookup-master.opt 2010-08-21 18:57:43 +0000
222@@ -1,1 +1,1 @@
223---plugin_add=embedded_innodb --plugin_remove=innobase
224+--plugin-add=embedded_innodb --plugin-remove=innobase
225
226=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_innodb_table_proto_table-master.opt'
227--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_innodb_table_proto_table-master.opt 2010-02-26 00:53:49 +0000
228+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_innodb_table_proto_table-master.opt 2010-08-21 18:57:43 +0000
229@@ -1,1 +1,1 @@
230---plugin_add=embedded_innodb --plugin_remove=innobase
231+--plugin-add=embedded_innodb --plugin-remove=innobase
232
233=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_innodb_truncate_table-master.opt'
234--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_innodb_truncate_table-master.opt 2010-03-10 12:23:11 +0000
235+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_innodb_truncate_table-master.opt 2010-08-21 18:57:43 +0000
236@@ -1,1 +1,1 @@
237---plugin_add=embedded_innodb --plugin_remove=innobase
238+--plugin-add=embedded_innodb --plugin-remove=innobase
239
240=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert-master.opt'
241--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert-master.opt 2010-02-14 06:26:01 +0000
242+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert-master.opt 2010-08-21 18:57:43 +0000
243@@ -1,1 +1,1 @@
244---plugin_add=embedded_innodb --plugin_remove=innobase
245+--plugin-add=embedded_innodb --plugin-remove=innobase
246
247=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_multi_column-master.opt'
248--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_multi_column-master.opt 2010-02-14 06:57:04 +0000
249+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_multi_column-master.opt 2010-08-21 18:57:43 +0000
250@@ -1,1 +1,1 @@
251---plugin_add=embedded_innodb --plugin_remove=innobase
252+--plugin-add=embedded_innodb --plugin-remove=innobase
253
254=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_pkey_duplicate-master.opt'
255--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_pkey_duplicate-master.opt 2010-02-24 01:42:24 +0000
256+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_pkey_duplicate-master.opt 2010-08-21 18:57:43 +0000
257@@ -1,1 +1,1 @@
258---plugin_add=embedded_innodb --plugin_remove=innobase
259+--plugin-add=embedded_innodb --plugin-remove=innobase
260
261=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_nopkey_index_read-master.opt'
262--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_nopkey_index_read-master.opt 2010-06-09 05:26:50 +0000
263+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_nopkey_index_read-master.opt 2010-08-21 18:57:43 +0000
264@@ -1,1 +1,1 @@
265---plugin_add=embedded_innodb --plugin_remove=innobase
266+--plugin-add=embedded_innodb --plugin-remove=innobase
267
268=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_pkey_index_reverse_scan-master.opt'
269--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_pkey_index_reverse_scan-master.opt 2010-02-25 05:54:30 +0000
270+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_pkey_index_reverse_scan-master.opt 2010-08-21 18:57:43 +0000
271@@ -1,1 +1,1 @@
272---plugin_add=embedded_innodb --plugin_remove=innobase
273+--plugin-add=embedded_innodb --plugin-remove=innobase
274
275=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_pkey_index_scan-master.opt'
276--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_pkey_index_scan-master.opt 2010-02-25 05:33:30 +0000
277+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_pkey_index_scan-master.opt 2010-08-21 18:57:43 +0000
278@@ -1,1 +1,1 @@
279---plugin_add=embedded_innodb --plugin_remove=innobase
280+--plugin-add=embedded_innodb --plugin-remove=innobase
281
282=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_rename_table-master.opt'
283--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_rename_table-master.opt 2010-03-13 01:01:11 +0000
284+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_rename_table-master.opt 2010-08-21 18:57:43 +0000
285@@ -1,1 +1,1 @@
286---plugin_add=embedded_innodb --plugin_remove=innobase
287+--plugin-add=embedded_innodb --plugin-remove=innobase
288
289=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_savepoint-master.opt'
290--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_savepoint-master.opt 2010-03-11 07:14:45 +0000
291+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_savepoint-master.opt 2010-08-21 18:57:43 +0000
292@@ -1,1 +1,1 @@
293---plugin_add=embedded_innodb --plugin_remove=innobase
294+--plugin-add=embedded_innodb --plugin-remove=innobase
295
296=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_sec_index_prev-master.opt'
297--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_sec_index_prev-master.opt 2010-06-09 05:49:14 +0000
298+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_sec_index_prev-master.opt 2010-08-21 18:57:43 +0000
299@@ -1,1 +1,1 @@
300---plugin_add=embedded_innodb --plugin_remove=innobase
301+--plugin-add=embedded_innodb --plugin-remove=innobase
302
303=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select-master.opt'
304--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select-master.opt 2010-02-14 06:48:26 +0000
305+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select-master.opt 2010-08-21 18:57:43 +0000
306@@ -1,1 +1,1 @@
307---plugin_add=embedded_innodb --plugin_remove=innobase
308+--plugin-add=embedded_innodb --plugin-remove=innobase
309
310=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update-master.opt'
311--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update-master.opt 2010-08-16 19:40:35 +0000
312+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update-master.opt 2010-08-21 18:57:43 +0000
313@@ -1,1 +1,1 @@
314---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.lock-wait-timeout=1
315+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.lock-wait-timeout=1
316
317=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update_pk_index-master.opt'
318--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update_pk_index-master.opt 2010-08-16 19:40:35 +0000
319+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update_pk_index-master.opt 2010-08-21 18:57:43 +0000
320@@ -1,1 +1,1 @@
321---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.lock-wait-timeout=1
322+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.lock-wait-timeout=1
323
324=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_multirow-master.opt'
325--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_multirow-master.opt 2010-02-14 06:52:01 +0000
326+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_multirow-master.opt 2010-08-21 18:57:43 +0000
327@@ -1,1 +1,1 @@
328---plugin_add=embedded_innodb --plugin_remove=innobase
329+--plugin-add=embedded_innodb --plugin-remove=innobase
330
331=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_show_tables-master.opt'
332--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_show_tables-master.opt 2010-02-12 06:36:02 +0000
333+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_show_tables-master.opt 2010-08-21 18:57:43 +0000
334@@ -1,1 +1,1 @@
335---plugin_add=embedded_innodb --plugin_remove=innobase
336+--plugin-add=embedded_innodb --plugin-remove=innobase
337
338=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_statement_rollback-master.opt'
339--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_statement_rollback-master.opt 2010-03-11 05:13:23 +0000
340+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_statement_rollback-master.opt 2010-08-21 18:57:43 +0000
341@@ -1,1 +1,1 @@
342---plugin_add=embedded_innodb --plugin_remove=innobase
343+--plugin-add=embedded_innodb --plugin-remove=innobase
344
345=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction-master.opt'
346--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction-master.opt 2010-03-10 12:22:25 +0000
347+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction-master.opt 2010-08-21 18:57:43 +0000
348@@ -1,1 +1,1 @@
349---plugin_add=embedded_innodb --plugin_remove=innobase
350+--plugin-add=embedded_innodb --plugin-remove=innobase
351
352=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction_autocommit-master.opt'
353--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction_autocommit-master.opt 2010-03-10 12:28:00 +0000
354+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction_autocommit-master.opt 2010-08-21 18:57:43 +0000
355@@ -1,1 +1,1 @@
356---plugin_add=embedded_innodb --plugin_remove=innobase
357+--plugin-add=embedded_innodb --plugin-remove=innobase
358
359=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction_rollback-master.opt'
360--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction_rollback-master.opt 2010-03-10 13:42:42 +0000
361+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_transaction_rollback-master.opt 2010-08-21 18:57:43 +0000
362@@ -1,1 +1,1 @@
363---plugin_add=embedded_innodb --plugin_remove=innobase
364+--plugin-add=embedded_innodb --plugin-remove=innobase
365
366=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_type_decimal-master.opt'
367--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_type_decimal-master.opt 2010-05-27 06:08:02 +0000
368+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_type_decimal-master.opt 2010-08-21 18:57:43 +0000
369@@ -1,1 +1,1 @@
370---plugin_add=embedded_innodb --plugin_remove=innobase
371+--plugin-add=embedded_innodb --plugin-remove=innobase
372
373=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_update-master.opt'
374--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_update-master.opt 2010-03-12 03:49:04 +0000
375+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_update-master.opt 2010-08-21 18:57:43 +0000
376@@ -1,1 +1,1 @@
377---plugin_add=embedded_innodb --plugin_remove=innobase
378+--plugin-add=embedded_innodb --plugin-remove=innobase
379
380=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_with_indexes-master.opt'
381--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_with_indexes-master.opt 2010-02-24 01:50:52 +0000
382+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_with_indexes-master.opt 2010-08-21 18:57:43 +0000
383@@ -1,1 +1,1 @@
384---plugin_add=embedded_innodb --plugin_remove=innobase
385+--plugin-add=embedded_innodb --plugin-remove=innobase
386
387=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/bench_count_distinct-master.opt'
388--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/bench_count_distinct-master.opt 2010-06-09 04:33:08 +0000
389+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/bench_count_distinct-master.opt 2010-08-21 18:57:43 +0000
390@@ -1,1 +1,1 @@
391---plugin_add=embedded_innodb --plugin_remove=innobase
392+--plugin-add=embedded_innodb --plugin-remove=innobase
393
394=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/bool-master.opt'
395--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/bool-master.opt 2010-05-13 14:10:16 +0000
396+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/bool-master.opt 2010-08-21 18:57:43 +0000
397@@ -1,1 +1,1 @@
398---plugin_add=embedded_innodb --plugin_remove=innobase
399+--plugin-add=embedded_innodb --plugin-remove=innobase
400
401=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/comments-master.opt'
402--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/comments-master.opt 2010-06-09 04:35:15 +0000
403+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/comments-master.opt 2010-08-21 18:57:43 +0000
404@@ -1,1 +1,1 @@
405---plugin_add=embedded_innodb --plugin_remove=innobase
406+--plugin-add=embedded_innodb --plugin-remove=innobase
407
408=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_default-master.opt'
409--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_default-master.opt 2010-05-10 13:17:59 +0000
410+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_default-master.opt 2010-08-21 18:57:43 +0000
411@@ -1,1 +1,1 @@
412---plugin_add=embedded_innodb --plugin_remove=innobase
413+--plugin-add=embedded_innodb --plugin-remove=innobase
414
415=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_off-master.opt'
416--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_off-master.opt 2010-08-06 09:07:03 +0000
417+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_off-master.opt 2010-08-21 18:57:43 +0000
418@@ -1,1 +1,1 @@
419---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.adaptive-flushing=false
420+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.adaptive-flushing=false
421
422=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt'
423--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt 2010-08-06 09:07:03 +0000
424+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt 2010-08-21 18:57:43 +0000
425@@ -1,1 +1,1 @@
426---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.adaptive-flushing=true
427+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.adaptive-flushing=true
428
429=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_default-master.opt'
430--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_default-master.opt 2010-05-10 12:53:25 +0000
431+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_default-master.opt 2010-08-21 18:57:43 +0000
432@@ -1,1 +1,1 @@
433---plugin_add=embedded_innodb --plugin_remove=innobase
434+--plugin-add=embedded_innodb --plugin-remove=innobase
435
436=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_off-master.opt'
437--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_off-master.opt 2010-08-06 09:07:03 +0000
438+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_off-master.opt 2010-08-21 18:57:43 +0000
439@@ -1,1 +1,1 @@
440---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.adaptive-hash-index=false
441+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.adaptive-hash-index=false
442
443=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_on-master.opt'
444--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_on-master.opt 2010-08-06 09:07:03 +0000
445+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_on-master.opt 2010-08-21 18:57:43 +0000
446@@ -1,1 +1,1 @@
447---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.adaptive-hash-index=true
448+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.adaptive-hash-index=true
449
450=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_32m-master.opt'
451--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_32m-master.opt 2010-08-06 09:07:03 +0000
452+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_32m-master.opt 2010-08-21 18:57:43 +0000
453@@ -1,1 +1,1 @@
454---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.additional-mem-pool-size=33554432
455+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.additional-mem-pool-size=33554432
456
457=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_addtl_mem_pool_size_default-master.opt'
458--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_addtl_mem_pool_size_default-master.opt 2010-07-08 21:21:35 +0000
459+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_addtl_mem_pool_size_default-master.opt 2010-08-21 18:57:43 +0000
460@@ -1,1 +1,1 @@
461---plugin_add=embedded_innodb --plugin_remove=innobase
462+--plugin-add=embedded_innodb --plugin-remove=innobase
463
464=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_42-master.opt'
465--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_42-master.opt 2010-08-06 09:07:03 +0000
466+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_42-master.opt 2010-08-21 18:57:43 +0000
467@@ -1,1 +1,1 @@
468---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.autoextend-increment=42
469+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.autoextend-increment=42
470
471=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_default-master.opt'
472--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_default-master.opt 2010-05-10 13:56:23 +0000
473+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_default-master.opt 2010-08-21 18:57:43 +0000
474@@ -1,1 +1,1 @@
475---plugin_add=embedded_innodb --plugin_remove=innobase
476+--plugin-add=embedded_innodb --plugin-remove=innobase
477
478=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_22m-master.opt'
479--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_22m-master.opt 2010-08-06 09:07:03 +0000
480+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_22m-master.opt 2010-08-21 18:57:43 +0000
481@@ -1,1 +1,1 @@
482---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.buffer-pool-size=20971520
483+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.buffer-pool-size=20971520
484
485=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_default-master.opt'
486--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_default-master.opt 2010-05-10 14:02:46 +0000
487+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_default-master.opt 2010-08-21 18:57:43 +0000
488@@ -1,1 +1,1 @@
489---plugin_add=embedded_innodb --plugin_remove=innobase
490+--plugin-add=embedded_innodb --plugin-remove=innobase
491
492=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_disable-master.opt'
493--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_disable-master.opt 2010-08-06 09:07:03 +0000
494+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_disable-master.opt 2010-08-21 18:57:43 +0000
495@@ -1,1 +1,1 @@
496---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.checksums=false
497+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.checksums=false
498
499=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_enable-master.opt'
500--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_enable-master.opt 2010-08-06 09:07:03 +0000
501+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_enable-master.opt 2010-08-21 18:57:43 +0000
502@@ -1,1 +1,1 @@
503---plugin_add=embedded_innodb --plugin_remove=innobase
504+--plugin-add=embedded_innodb --plugin-remove=innobase
505
506=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt'
507--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt 2010-08-06 09:07:03 +0000
508+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt 2010-08-21 18:57:43 +0000
509@@ -1,1 +1,1 @@
510---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.doublewrite=false
511+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.doublewrite=false
512
513=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt'
514--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt 2010-08-06 09:07:03 +0000
515+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt 2010-08-21 18:57:43 +0000
516@@ -1,1 +1,1 @@
517---plugin_add=embedded_innodb --plugin_remove=innobase
518+--plugin-add=embedded_innodb --plugin-remove=innobase
519
520=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown0-master.opt'
521--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown0-master.opt 2010-08-06 09:07:03 +0000
522+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown0-master.opt 2010-08-21 18:57:43 +0000
523@@ -1,1 +1,1 @@
524---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.fast-shutdown=0
525+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.fast-shutdown=0
526
527=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown1-master.opt'
528--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown1-master.opt 2010-08-06 09:07:03 +0000
529+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown1-master.opt 2010-08-21 18:57:43 +0000
530@@ -1,1 +1,1 @@
531---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.fast-shutdown=1
532+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.fast-shutdown=1
533
534=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown2-master.opt'
535--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown2-master.opt 2010-08-06 09:07:03 +0000
536+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown2-master.opt 2010-08-21 18:57:43 +0000
537@@ -1,1 +1,1 @@
538---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.fast-shutdown=2
539+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.fast-shutdown=2
540
541=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format-master.opt'
542--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format-master.opt 2010-05-05 02:33:31 +0000
543+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format-master.opt 2010-08-21 18:57:43 +0000
544@@ -1,1 +1,1 @@
545---plugin_add=embedded_innodb --plugin_remove=innobase
546+--plugin-add=embedded_innodb --plugin-remove=innobase
547
548=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_disable-master.opt'
549--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_disable-master.opt 2010-08-06 09:07:03 +0000
550+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_disable-master.opt 2010-08-21 18:57:43 +0000
551@@ -1,1 +1,1 @@
552---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.file-per-table=false
553+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.file-per-table=false
554
555=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_enable-master.opt'
556--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_enable-master.opt 2010-08-06 09:07:03 +0000
557+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_enable-master.opt 2010-08-21 18:57:43 +0000
558@@ -1,1 +1,1 @@
559---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.file-per-table=true
560+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.file-per-table=true
561
562=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt'
563--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt 2010-08-06 09:07:03 +0000
564+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt 2010-08-21 18:57:43 +0000
565@@ -1,1 +1,1 @@
566---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-log-at-trx-commit=0
567+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.flush-log-at-trx-commit=0
568
569=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt'
570--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt 2010-08-06 09:07:03 +0000
571+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt 2010-08-21 18:57:43 +0000
572@@ -1,1 +1,1 @@
573---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-log-at-trx-commit=1
574+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.flush-log-at-trx-commit=1
575
576=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt'
577--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt 2010-08-06 09:07:03 +0000
578+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt 2010-08-21 18:57:43 +0000
579@@ -1,1 +1,1 @@
580---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-log-at-trx-commit=2
581+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.flush-log-at-trx-commit=2
582
583=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method-master.opt'
584--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method-master.opt 2010-05-06 09:50:02 +0000
585+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method-master.opt 2010-08-21 18:57:43 +0000
586@@ -1,1 +1,1 @@
587---plugin_add=embedded_innodb --plugin_remove=innobase
588+--plugin-add=embedded_innodb --plugin-remove=innobase
589
590=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_fsync-master.opt'
591--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_fsync-master.opt 2010-08-06 09:07:03 +0000
592+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_fsync-master.opt 2010-08-21 18:57:43 +0000
593@@ -1,1 +1,1 @@
594---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-method=fsync
595+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.flush-method=fsync
596
597=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odirect-master.opt'
598--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odirect-master.opt 2010-08-06 09:07:03 +0000
599+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odirect-master.opt 2010-08-21 18:57:43 +0000
600@@ -1,1 +1,1 @@
601---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-method=O_DIRECT
602+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.flush-method=O_DIRECT
603
604=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odsync-master.opt'
605--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odsync-master.opt 2010-08-06 09:07:03 +0000
606+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odsync-master.opt 2010-08-21 18:57:43 +0000
607@@ -1,1 +1,1 @@
608---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-method=O_DSYNC
609+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.flush-method=O_DSYNC
610
611=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_force_recovery-master.opt'
612--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_force_recovery-master.opt 2010-08-06 09:07:03 +0000
613+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_force_recovery-master.opt 2010-08-21 18:57:43 +0000
614@@ -1,1 +1,1 @@
615---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.force-recovery=1
616+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.force-recovery=1
617
618=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_io_capacity-master.opt'
619--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_io_capacity-master.opt 2010-08-06 09:07:03 +0000
620+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_io_capacity-master.opt 2010-08-21 18:57:43 +0000
621@@ -1,1 +1,1 @@
622---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.io-capacity=500
623+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.io-capacity=500
624
625=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lock_wait_timeout_1-master.opt'
626--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lock_wait_timeout_1-master.opt 2010-08-06 09:07:03 +0000
627+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lock_wait_timeout_1-master.opt 2010-08-21 18:57:43 +0000
628@@ -1,1 +1,1 @@
629---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.lock-wait-timeout=1
630+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.lock-wait-timeout=1
631
632=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_5m-master.opt'
633--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_5m-master.opt 2010-08-06 09:07:03 +0000
634+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_5m-master.opt 2010-08-21 18:57:43 +0000
635@@ -1,1 +1,1 @@
636---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.log-buffer-size=5242880
637+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.log-buffer-size=5242880
638
639=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_default-master.opt'
640--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_default-master.opt 2010-05-11 05:36:20 +0000
641+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_default-master.opt 2010-08-21 18:57:43 +0000
642@@ -1,1 +1,1 @@
643---plugin_add=embedded_innodb --plugin_remove=innobase
644+--plugin-add=embedded_innodb --plugin-remove=innobase
645
646=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_group_home_dir-master.opt'
647--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_group_home_dir-master.opt 2010-05-07 04:20:47 +0000
648+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_group_home_dir-master.opt 2010-08-21 18:57:43 +0000
649@@ -1,1 +1,1 @@
650---plugin_add=embedded_innodb --plugin_remove=innobase
651+--plugin-add=embedded_innodb --plugin-remove=innobase
652
653=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lru_block_access_recency-master.opt'
654--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lru_block_access_recency-master.opt 2010-05-07 13:05:14 +0000
655+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lru_block_access_recency-master.opt 2010-08-21 18:57:43 +0000
656@@ -1,1 +1,1 @@
657---plugin_add=embedded_innodb --plugin_remove=innobase
658+--plugin-add=embedded_innodb --plugin-remove=innobase
659
660=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lru_old_blocks_pct-master.opt'
661--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lru_old_blocks_pct-master.opt 2010-05-07 13:05:14 +0000
662+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lru_old_blocks_pct-master.opt 2010-08-21 18:57:43 +0000
663@@ -1,1 +1,1 @@
664---plugin_add=embedded_innodb --plugin_remove=innobase
665+--plugin-add=embedded_innodb --plugin-remove=innobase
666
667=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct-master.opt'
668--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct-master.opt 2010-05-07 08:02:05 +0000
669+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct-master.opt 2010-08-21 18:57:43 +0000
670@@ -1,1 +1,1 @@
671---plugin_add=embedded_innodb --plugin_remove=innobase
672+--plugin-add=embedded_innodb --plugin-remove=innobase
673
674=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct_50-master.opt'
675--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct_50-master.opt 2010-08-06 09:07:03 +0000
676+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct_50-master.opt 2010-08-21 18:57:43 +0000
677@@ -1,1 +1,1 @@
678---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.max-dirty-pages-pct=50
679+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.max-dirty-pages-pct=50
680
681=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag-master.opt'
682--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag-master.opt 2010-05-07 12:15:41 +0000
683+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag-master.opt 2010-08-21 18:57:43 +0000
684@@ -1,1 +1,1 @@
685---plugin_add=embedded_innodb --plugin_remove=innobase
686+--plugin-add=embedded_innodb --plugin-remove=innobase
687
688=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag_42-master.opt'
689--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag_42-master.opt 2010-08-06 09:07:03 +0000
690+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag_42-master.opt 2010-08-21 18:57:43 +0000
691@@ -1,1 +1,1 @@
692---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.max-purge-lag=42
693+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.max-purge-lag=42
694
695=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_800-master.opt'
696--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_800-master.opt 2010-08-06 09:07:03 +0000
697+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_800-master.opt 2010-08-21 18:57:43 +0000
698@@ -1,1 +1,1 @@
699---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.open-files=800
700+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.open-files=800
701
702=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_default-master.opt'
703--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_default-master.opt 2010-05-10 05:13:41 +0000
704+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_default-master.opt 2010-08-21 18:57:43 +0000
705@@ -1,1 +1,1 @@
706---plugin_add=embedded_innodb --plugin_remove=innobase
707+--plugin-add=embedded_innodb --plugin-remove=innobase
708
709=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log-master.opt'
710--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log-master.opt 2010-05-11 05:46:17 +0000
711+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log-master.opt 2010-08-21 18:57:43 +0000
712@@ -1,1 +1,1 @@
713---plugin_add=embedded_innodb --plugin_remove=innobase
714+--plugin-add=embedded_innodb --plugin-remove=innobase
715
716=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_off-master.opt'
717--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_off-master.opt 2010-08-06 09:07:03 +0000
718+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_off-master.opt 2010-08-21 18:57:43 +0000
719@@ -1,1 +1,1 @@
720---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.print-verbose-log=false
721+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.print-verbose-log=false
722
723=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_on-master.opt'
724--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_on-master.opt 2010-08-06 09:07:03 +0000
725+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_on-master.opt 2010-08-21 18:57:43 +0000
726@@ -1,1 +1,1 @@
727---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.print-verbose-log=true
728+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.print-verbose-log=true
729
730=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt'
731--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt 2010-08-06 09:07:03 +0000
732+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt 2010-08-21 18:57:43 +0000
733@@ -1,1 +1,1 @@
734---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.read-io-threads=64
735+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.read-io-threads=64
736
737=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default-master.opt'
738--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default-master.opt 2010-05-10 06:06:20 +0000
739+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_default-master.opt 2010-08-21 18:57:43 +0000
740@@ -1,1 +1,1 @@
741---plugin_add=embedded_innodb --plugin_remove=innobase
742+--plugin-add=embedded_innodb --plugin-remove=innobase
743
744=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout-master.opt'
745--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout-master.opt 2010-05-11 07:09:35 +0000
746+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout-master.opt 2010-08-21 18:57:43 +0000
747@@ -1,1 +1,1 @@
748---plugin_add=embedded_innodb --plugin_remove=innobase
749+--plugin-add=embedded_innodb --plugin-remove=innobase
750
751=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_off-master.opt'
752--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_off-master.opt 2010-08-06 09:07:03 +0000
753+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_off-master.opt 2010-08-21 18:57:43 +0000
754@@ -1,1 +1,1 @@
755---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.rollback-on-timeout=false
756+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.rollback-on-timeout=false
757
758=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_on-master.opt'
759--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_on-master.opt 2010-08-06 09:07:03 +0000
760+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_on-master.opt 2010-08-21 18:57:43 +0000
761@@ -1,1 +1,1 @@
762---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.rollback-on-timeout=1
763+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.rollback-on-timeout=1
764
765=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_status_file-master.opt'
766--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_status_file-master.opt 2010-05-11 07:19:05 +0000
767+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_status_file-master.opt 2010-08-21 18:57:43 +0000
768@@ -1,1 +1,1 @@
769---plugin_add=embedded_innodb --plugin_remove=innobase
770+--plugin-add=embedded_innodb --plugin-remove=innobase
771
772=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops-master.opt'
773--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops-master.opt 2010-05-11 07:29:33 +0000
774+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops-master.opt 2010-08-21 18:57:43 +0000
775@@ -1,1 +1,1 @@
776---plugin_add=embedded_innodb --plugin_remove=innobase
777+--plugin-add=embedded_innodb --plugin-remove=innobase
778
779=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops_100-master.opt'
780--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops_100-master.opt 2010-08-06 09:07:03 +0000
781+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops_100-master.opt 2010-08-21 18:57:43 +0000
782@@ -1,1 +1,1 @@
783---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.sync-spin-loops=100
784+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.sync-spin-loops=100
785
786=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_table_function-master.opt'
787--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_table_function-master.opt 2010-03-15 04:42:26 +0000
788+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_table_function-master.opt 2010-08-21 18:57:43 +0000
789@@ -1,1 +1,1 @@
790---plugin_add=embedded_innodb --plugin_remove=innobase
791+--plugin-add=embedded_innodb --plugin-remove=innobase
792
793=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc-master.opt'
794--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc-master.opt 2010-05-11 07:29:33 +0000
795+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc-master.opt 2010-08-21 18:57:43 +0000
796@@ -1,1 +1,1 @@
797---plugin_add=embedded_innodb --plugin_remove=innobase
798+--plugin-add=embedded_innodb --plugin-remove=innobase
799
800=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_off-master.opt'
801--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_off-master.opt 2010-08-06 09:07:03 +0000
802+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_off-master.opt 2010-08-21 18:57:43 +0000
803@@ -1,1 +1,1 @@
804---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.use-sys-malloc=0
805+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.use-sys-malloc=0
806
807=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_on-master.opt'
808--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_on-master.opt 2010-08-06 09:07:03 +0000
809+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_on-master.opt 2010-08-21 18:57:43 +0000
810@@ -1,1 +1,1 @@
811---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.use-sys-malloc=1
812+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.use-sys-malloc=1
813
814=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt'
815--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt 2010-08-06 09:07:03 +0000
816+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt 2010-08-21 18:57:43 +0000
817@@ -1,1 +1,1 @@
818---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.write-io-threads=64
819+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.write-io-threads=64
820
821=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default-master.opt'
822--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default-master.opt 2010-05-10 06:09:51 +0000
823+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_default-master.opt 2010-08-21 18:57:43 +0000
824@@ -1,1 +1,1 @@
825---plugin_add=embedded_innodb --plugin_remove=innobase
826+--plugin-add=embedded_innodb --plugin-remove=innobase
827
828=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct-master.opt'
829--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct-master.opt 2010-06-09 04:30:04 +0000
830+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct-master.opt 2010-08-21 18:57:43 +0000
831@@ -1,1 +1,1 @@
832---plugin_add=embedded_innodb --plugin_remove=innobase
833+--plugin-add=embedded_innodb --plugin-remove=innobase
834
835=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct2-master.opt'
836--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct2-master.opt 2010-06-09 04:31:19 +0000
837+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct2-master.opt 2010-08-21 18:57:43 +0000
838@@ -1,1 +1,1 @@
839---plugin_add=embedded_innodb --plugin_remove=innobase
840+--plugin-add=embedded_innodb --plugin-remove=innobase
841
842=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct3-master.opt'
843--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct3-master.opt 2010-05-13 14:10:16 +0000
844+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/count_distinct3-master.opt 2010-08-21 18:57:43 +0000
845@@ -1,1 +1,1 @@
846---plugin_add=embedded_innodb --plugin_remove=innobase
847+--plugin-add=embedded_innodb --plugin-remove=innobase
848
849=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/cursor_position-master.opt'
850--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/cursor_position-master.opt 2010-03-23 05:34:03 +0000
851+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/cursor_position-master.opt 2010-08-21 18:57:43 +0000
852@@ -1,1 +1,1 @@
853---plugin_add=embedded_innodb --plugin_remove=innobase
854+--plugin-add=embedded_innodb --plugin-remove=innobase
855
856=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/drizzleslap-master.opt'
857--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/drizzleslap-master.opt 2010-04-28 09:15:48 +0000
858+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/drizzleslap-master.opt 2010-08-21 18:57:43 +0000
859@@ -1,1 +1,1 @@
860---plugin_add=embedded_innodb --plugin_remove=innobase
861+--plugin-add=embedded_innodb --plugin-remove=innobase
862
863=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_length_limit-master.opt'
864--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_length_limit-master.opt 2010-06-21 04:16:56 +0000
865+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_length_limit-master.opt 2010-08-21 18:57:43 +0000
866@@ -1,1 +1,1 @@
867---plugin_add=embedded_innodb --plugin_remove=innobase
868+--plugin-add=embedded_innodb --plugin-remove=innobase
869
870=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_multicolumn_unique-master.opt'
871--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_multicolumn_unique-master.opt 2010-03-22 09:57:00 +0000
872+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_multicolumn_unique-master.opt 2010-08-21 18:57:43 +0000
873@@ -1,1 +1,1 @@
874---plugin_add=embedded_innodb --plugin_remove=innobase
875+--plugin-add=embedded_innodb --plugin-remove=innobase
876
877=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_null-master.opt'
878--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_null-master.opt 2010-03-22 10:14:16 +0000
879+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_null-master.opt 2010-08-21 18:57:43 +0000
880@@ -1,1 +1,1 @@
881---plugin_add=embedded_innodb --plugin_remove=innobase
882+--plugin-add=embedded_innodb --plugin-remove=innobase
883
884=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_prefix-master.opt'
885--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_prefix-master.opt 2010-06-21 05:01:48 +0000
886+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_prefix-master.opt 2010-08-21 18:57:43 +0000
887@@ -1,1 +1,1 @@
888---plugin_add=embedded_innodb --plugin_remove=innobase
889+--plugin-add=embedded_innodb --plugin-remove=innobase
890
891=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_varchar-master.opt'
892--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_varchar-master.opt 2010-03-22 09:57:00 +0000
893+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_varchar-master.opt 2010-08-21 18:57:43 +0000
894@@ -1,1 +1,1 @@
895---plugin_add=embedded_innodb --plugin_remove=innobase
896+--plugin-add=embedded_innodb --plugin-remove=innobase
897
898=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/insert_null-master.opt'
899--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/insert_null-master.opt 2010-03-22 10:08:44 +0000
900+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/insert_null-master.opt 2010-08-21 18:57:43 +0000
901@@ -1,1 +1,1 @@
902---plugin_add=embedded_innodb --plugin_remove=innobase
903+--plugin-add=embedded_innodb --plugin-remove=innobase
904
905=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_datadict_dump_func-master.opt'
906--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_datadict_dump_func-master.opt 2010-02-11 01:32:37 +0000
907+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_datadict_dump_func-master.opt 2010-08-21 18:57:43 +0000
908@@ -1,1 +1,1 @@
909---plugin_add=embedded_innodb --plugin_remove=innobase
910+--plugin-add=embedded_innodb --plugin-remove=innobase
911
912=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_version_func-master.opt'
913--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_version_func-master.opt 2010-02-08 07:23:17 +0000
914+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/libinnodb_version_func-master.opt 2010-08-21 18:57:43 +0000
915@@ -1,1 +1,1 @@
916---plugin_add=embedded_innodb --plugin_remove=innobase
917+--plugin-add=embedded_innodb --plugin-remove=innobase
918
919=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/plugin_load-master.opt'
920--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/plugin_load-master.opt 2010-02-08 07:23:17 +0000
921+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/plugin_load-master.opt 2010-08-21 18:57:43 +0000
922@@ -1,1 +1,1 @@
923---plugin_add=embedded_innodb --plugin_remove=innobase
924+--plugin-add=embedded_innodb --plugin-remove=innobase
925
926=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rename-master.opt'
927--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rename-master.opt 2010-03-13 01:01:11 +0000
928+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rename-master.opt 2010-08-21 18:57:43 +0000
929@@ -1,1 +1,1 @@
930---plugin_add=embedded_innodb --plugin_remove=innobase
931+--plugin-add=embedded_innodb --plugin-remove=innobase
932
933=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/replace-master.opt'
934--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/replace-master.opt 2010-05-17 07:13:37 +0000
935+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/replace-master.opt 2010-08-21 18:57:43 +0000
936@@ -1,1 +1,1 @@
937---plugin_add=embedded_innodb --plugin_remove=innobase
938+--plugin-add=embedded_innodb --plugin-remove=innobase
939
940=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rnd_pos-master.opt'
941--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rnd_pos-master.opt 2010-03-25 09:25:43 +0000
942+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rnd_pos-master.opt 2010-08-21 18:57:43 +0000
943@@ -1,1 +1,1 @@
944---plugin_add=embedded_innodb --plugin_remove=innobase
945+--plugin-add=embedded_innodb --plugin-remove=innobase
946
947=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format-master.opt'
948--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format-master.opt 2010-06-07 08:46:37 +0000
949+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format-master.opt 2010-08-21 18:57:43 +0000
950@@ -1,1 +1,1 @@
951---plugin_add=embedded_innodb --plugin_remove=innobase
952+--plugin-add=embedded_innodb --plugin-remove=innobase
953
954=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format_file_per_table-master.opt'
955--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format_file_per_table-master.opt 2010-08-09 07:38:41 +0000
956+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format_file_per_table-master.opt 2010-08-21 18:57:43 +0000
957@@ -1,1 +1,1 @@
958---plugin_add=embedded_innodb --plugin_remove=innobase --innodb.file-per-table=1
959+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.file-per-table=1
960
961=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/secondary_index_scan-master.opt'
962--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/secondary_index_scan-master.opt 2010-03-19 00:18:53 +0000
963+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/secondary_index_scan-master.opt 2010-08-21 18:57:43 +0000
964@@ -1,1 +1,1 @@
965---plugin_add=embedded_innodb --plugin_remove=innobase
966+--plugin-add=embedded_innodb --plugin-remove=innobase
967
968=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/status_table_function-master.opt'
969--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/status_table_function-master.opt 2010-03-16 05:54:01 +0000
970+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/status_table_function-master.opt 2010-08-21 18:57:43 +0000
971@@ -1,1 +1,1 @@
972---plugin_add=embedded_innodb --plugin_remove=innobase
973+--plugin-add=embedded_innodb --plugin-remove=innobase
974
975=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/truncate-master.opt'
976--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/truncate-master.opt 2010-04-27 13:00:14 +0000
977+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/truncate-master.opt 2010-08-21 18:57:43 +0000
978@@ -1,1 +1,1 @@
979---plugin_add=embedded_innodb --plugin_remove=innobase
980+--plugin-add=embedded_innodb --plugin-remove=innobase
981
982=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_read_uncommitted-master.opt'
983--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_read_uncommitted-master.opt 2010-05-31 06:30:16 +0000
984+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_read_uncommitted-master.opt 2010-08-21 18:57:43 +0000
985@@ -1,1 +1,1 @@
986---plugin_add=embedded_innodb --plugin_remove=innobase
987+--plugin-add=embedded_innodb --plugin-remove=innobase
988
989=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_repeatable_read-master.opt'
990--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_repeatable_read-master.opt 2010-05-31 06:30:16 +0000
991+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_repeatable_read-master.opt 2010-08-21 18:57:43 +0000
992@@ -1,1 +1,1 @@
993---plugin_add=embedded_innodb --plugin_remove=innobase
994+--plugin-add=embedded_innodb --plugin-remove=innobase
995
996=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_serializable-master.opt'
997--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_serializable-master.opt 2010-05-31 09:08:00 +0000
998+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/trx_isolation_serializable-master.opt 2010-08-21 18:57:43 +0000
999@@ -1,1 +1,1 @@
1000---plugin_add=embedded_innodb --plugin_remove=innobase
1001+--plugin-add=embedded_innodb --plugin-remove=innobase
1002
1003=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob-master.opt'
1004--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob-master.opt 2010-05-26 14:53:47 +0000
1005+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob-master.opt 2010-08-21 18:57:43 +0000
1006@@ -1,1 +1,1 @@
1007---plugin_add=embedded_innodb --plugin_remove=innobase
1008+--plugin-add=embedded_innodb --plugin-remove=innobase
1009
1010=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob_basic-master.opt'
1011--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob_basic-master.opt 2010-05-20 14:50:13 +0000
1012+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob_basic-master.opt 2010-08-21 18:57:43 +0000
1013@@ -1,1 +1,1 @@
1014---plugin_add=embedded_innodb --plugin_remove=innobase
1015+--plugin-add=embedded_innodb --plugin-remove=innobase
1016
1017=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob_func-master.opt'
1018--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob_func-master.opt 2010-05-25 05:32:03 +0000
1019+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob_func-master.opt 2010-08-21 18:57:43 +0000
1020@@ -1,1 +1,1 @@
1021---plugin_add=embedded_innodb --plugin_remove=innobase
1022+--plugin-add=embedded_innodb --plugin-remove=innobase
1023
1024=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_date-master.opt'
1025--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_date-master.opt 2010-04-28 02:32:03 +0000
1026+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_date-master.opt 2010-08-21 18:57:43 +0000
1027@@ -1,1 +1,1 @@
1028---plugin_add=embedded_innodb --plugin_remove=innobase
1029+--plugin-add=embedded_innodb --plugin-remove=innobase
1030
1031=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_datetime-master.opt'
1032--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_datetime-master.opt 2010-04-28 02:52:25 +0000
1033+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_datetime-master.opt 2010-08-21 18:57:43 +0000
1034@@ -1,1 +1,1 @@
1035---plugin_add=embedded_innodb --plugin_remove=innobase
1036+--plugin-add=embedded_innodb --plugin-remove=innobase
1037
1038=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_decimal-master.opt'
1039--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_decimal-master.opt 2010-05-27 06:09:12 +0000
1040+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_decimal-master.opt 2010-08-21 18:57:43 +0000
1041@@ -1,1 +1,1 @@
1042---plugin_add=embedded_innodb --plugin_remove=innobase
1043+--plugin-add=embedded_innodb --plugin-remove=innobase
1044
1045=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_enum-master.opt'
1046--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_enum-master.opt 2010-04-07 05:17:37 +0000
1047+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_enum-master.opt 2010-08-21 18:57:43 +0000
1048@@ -1,1 +1,1 @@
1049---plugin_add=embedded_innodb --plugin_remove=innobase
1050+--plugin-add=embedded_innodb --plugin-remove=innobase
1051
1052=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_float-master.opt'
1053--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_float-master.opt 2010-03-15 04:10:13 +0000
1054+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_float-master.opt 2010-08-21 18:57:43 +0000
1055@@ -1,1 +1,1 @@
1056---plugin_add=embedded_innodb --plugin_remove=innobase
1057+--plugin-add=embedded_innodb --plugin-remove=innobase
1058
1059=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_timestamp-master.opt'
1060--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_timestamp-master.opt 2010-04-27 04:31:43 +0000
1061+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_timestamp-master.opt 2010-08-21 18:57:43 +0000
1062@@ -1,1 +1,1 @@
1063---plugin_add=embedded_innodb --plugin_remove=innobase
1064+--plugin-add=embedded_innodb --plugin-remove=innobase
1065
1066=== modified file 'plugin/errmsg_notify/tests/t/notify-master.opt'
1067--- plugin/errmsg_notify/tests/t/notify-master.opt 2010-01-20 20:23:18 +0000
1068+++ plugin/errmsg_notify/tests/t/notify-master.opt 2010-08-21 18:57:43 +0000
1069@@ -1,1 +1,1 @@
1070---plugin_add=errmsg_notify
1071+--plugin-add=errmsg_notify
1072
1073=== modified file 'plugin/errmsg_stderr/tests/t/stderr-master.opt'
1074--- plugin/errmsg_stderr/tests/t/stderr-master.opt 2010-01-20 20:23:18 +0000
1075+++ plugin/errmsg_stderr/tests/t/stderr-master.opt 2010-08-21 18:57:43 +0000
1076@@ -1,1 +1,1 @@
1077---plugin_add=errmsg_stderr
1078+--plugin-add=errmsg_stderr
1079
1080=== modified file 'plugin/filesystem_engine/tests/t/basic_create_table-master.opt'
1081--- plugin/filesystem_engine/tests/t/basic_create_table-master.opt 2010-07-30 13:07:17 +0000
1082+++ plugin/filesystem_engine/tests/t/basic_create_table-master.opt 2010-08-21 18:57:43 +0000
1083@@ -1,1 +1,1 @@
1084---plugin_add=filesystem_engine
1085+--plugin-add=filesystem_engine
1086
1087=== modified file 'plugin/filesystem_engine/tests/t/basic_delete-master.opt'
1088--- plugin/filesystem_engine/tests/t/basic_delete-master.opt 2010-07-30 13:07:17 +0000
1089+++ plugin/filesystem_engine/tests/t/basic_delete-master.opt 2010-08-21 18:57:43 +0000
1090@@ -1,1 +1,1 @@
1091---plugin_add=filesystem_engine
1092+--plugin-add=filesystem_engine
1093
1094=== modified file 'plugin/filesystem_engine/tests/t/basic_insert-master.opt'
1095--- plugin/filesystem_engine/tests/t/basic_insert-master.opt 2010-07-30 13:07:17 +0000
1096+++ plugin/filesystem_engine/tests/t/basic_insert-master.opt 2010-08-21 18:57:43 +0000
1097@@ -1,1 +1,1 @@
1098---plugin_add=filesystem_engine
1099+--plugin-add=filesystem_engine
1100
1101=== modified file 'plugin/filesystem_engine/tests/t/basic_select-master.opt'
1102--- plugin/filesystem_engine/tests/t/basic_select-master.opt 2010-07-30 13:07:17 +0000
1103+++ plugin/filesystem_engine/tests/t/basic_select-master.opt 2010-08-21 18:57:43 +0000
1104@@ -1,1 +1,1 @@
1105---plugin_add=filesystem_engine
1106+--plugin-add=filesystem_engine
1107
1108=== modified file 'plugin/filesystem_engine/tests/t/basic_update-master.opt'
1109--- plugin/filesystem_engine/tests/t/basic_update-master.opt 2010-07-30 13:07:17 +0000
1110+++ plugin/filesystem_engine/tests/t/basic_update-master.opt 2010-08-21 18:57:43 +0000
1111@@ -1,1 +1,1 @@
1112---plugin_add=filesystem_engine
1113+--plugin-add=filesystem_engine
1114
1115=== modified file 'plugin/filesystem_engine/tests/t/multiple_update-master.opt'
1116--- plugin/filesystem_engine/tests/t/multiple_update-master.opt 2010-07-30 13:07:17 +0000
1117+++ plugin/filesystem_engine/tests/t/multiple_update-master.opt 2010-08-21 18:57:43 +0000
1118@@ -1,1 +1,1 @@
1119---plugin_add=filesystem_engine
1120+--plugin-add=filesystem_engine
1121
1122=== modified file 'plugin/filesystem_engine/tests/t/rnd_pos-master.opt'
1123--- plugin/filesystem_engine/tests/t/rnd_pos-master.opt 2010-07-30 13:07:17 +0000
1124+++ plugin/filesystem_engine/tests/t/rnd_pos-master.opt 2010-08-21 18:57:43 +0000
1125@@ -1,1 +1,1 @@
1126---plugin_add=filesystem_engine
1127+--plugin-add=filesystem_engine
1128
1129=== modified file 'plugin/filesystem_engine/tests/t/select_big_file-master.opt'
1130--- plugin/filesystem_engine/tests/t/select_big_file-master.opt 2010-07-30 13:07:17 +0000
1131+++ plugin/filesystem_engine/tests/t/select_big_file-master.opt 2010-08-21 18:57:43 +0000
1132@@ -1,1 +1,1 @@
1133---plugin_add=filesystem_engine
1134+--plugin-add=filesystem_engine
1135
1136=== modified file 'plugin/filesystem_engine/tests/t/select_chop_line-master.opt'
1137--- plugin/filesystem_engine/tests/t/select_chop_line-master.opt 2010-07-30 13:07:17 +0000
1138+++ plugin/filesystem_engine/tests/t/select_chop_line-master.opt 2010-08-21 18:57:43 +0000
1139@@ -1,1 +1,1 @@
1140---plugin_add=filesystem_engine
1141+--plugin-add=filesystem_engine
1142
1143=== modified file 'plugin/filesystem_engine/tests/t/select_cpuinfo-master.opt'
1144--- plugin/filesystem_engine/tests/t/select_cpuinfo-master.opt 2010-07-30 13:07:17 +0000
1145+++ plugin/filesystem_engine/tests/t/select_cpuinfo-master.opt 2010-08-21 18:57:43 +0000
1146@@ -1,1 +1,1 @@
1147---plugin_add=filesystem_engine
1148+--plugin-add=filesystem_engine
1149
1150=== modified file 'plugin/filesystem_engine/tests/t/select_meminfo-master.opt'
1151--- plugin/filesystem_engine/tests/t/select_meminfo-master.opt 2010-07-30 13:07:17 +0000
1152+++ plugin/filesystem_engine/tests/t/select_meminfo-master.opt 2010-08-21 18:57:43 +0000
1153@@ -1,1 +1,1 @@
1154---plugin_add=filesystem_engine
1155+--plugin-add=filesystem_engine
1156
1157=== modified file 'plugin/filesystem_engine/tests/t/select_separator_mode_weak-master.opt'
1158--- plugin/filesystem_engine/tests/t/select_separator_mode_weak-master.opt 2010-07-30 13:07:17 +0000
1159+++ plugin/filesystem_engine/tests/t/select_separator_mode_weak-master.opt 2010-08-21 18:57:43 +0000
1160@@ -1,1 +1,1 @@
1161---plugin_add=filesystem_engine
1162+--plugin-add=filesystem_engine
1163
1164=== modified file 'plugin/filesystem_engine/tests/t/select_short_line-master.opt'
1165--- plugin/filesystem_engine/tests/t/select_short_line-master.opt 2010-07-30 13:07:17 +0000
1166+++ plugin/filesystem_engine/tests/t/select_short_line-master.opt 2010-08-21 18:57:43 +0000
1167@@ -1,1 +1,1 @@
1168---plugin_add=filesystem_engine
1169+--plugin-add=filesystem_engine
1170
1171=== modified file 'plugin/filesystem_engine/tests/t/select_skip_blank_line-master.opt'
1172--- plugin/filesystem_engine/tests/t/select_skip_blank_line-master.opt 2010-07-30 13:07:17 +0000
1173+++ plugin/filesystem_engine/tests/t/select_skip_blank_line-master.opt 2010-08-21 18:57:43 +0000
1174@@ -1,1 +1,1 @@
1175---plugin_add=filesystem_engine
1176+--plugin-add=filesystem_engine
1177
1178=== modified file 'plugin/filesystem_engine/tests/t/select_with_escaped_character-master.opt'
1179--- plugin/filesystem_engine/tests/t/select_with_escaped_character-master.opt 2010-07-30 13:07:17 +0000
1180+++ plugin/filesystem_engine/tests/t/select_with_escaped_character-master.opt 2010-08-21 18:57:43 +0000
1181@@ -1,1 +1,1 @@
1182---plugin_add=filesystem_engine
1183+--plugin-add=filesystem_engine
1184
1185=== modified file 'plugin/filesystem_engine/tests/t/select_with_omit_field-master.opt'
1186--- plugin/filesystem_engine/tests/t/select_with_omit_field-master.opt 2010-07-30 13:07:17 +0000
1187+++ plugin/filesystem_engine/tests/t/select_with_omit_field-master.opt 2010-08-21 18:57:43 +0000
1188@@ -1,1 +1,1 @@
1189---plugin_add=filesystem_engine
1190+--plugin-add=filesystem_engine
1191
1192=== modified file 'plugin/filesystem_engine/tests/t/select_with_separators-master.opt'
1193--- plugin/filesystem_engine/tests/t/select_with_separators-master.opt 2010-07-30 13:07:17 +0000
1194+++ plugin/filesystem_engine/tests/t/select_with_separators-master.opt 2010-08-21 18:57:43 +0000
1195@@ -1,1 +1,1 @@
1196---plugin_add=filesystem_engine
1197+--plugin-add=filesystem_engine
1198
1199=== modified file 'plugin/hello_world/tests/t/hello_world-master.opt'
1200--- plugin/hello_world/tests/t/hello_world-master.opt 2010-01-13 08:20:13 +0000
1201+++ plugin/hello_world/tests/t/hello_world-master.opt 2010-08-21 18:57:43 +0000
1202@@ -1,1 +1,1 @@
1203---plugin_add=hello_world
1204+--plugin-add=hello_world
1205
1206=== modified file 'plugin/md5/tests/t/md5-master.opt'
1207--- plugin/md5/tests/t/md5-master.opt 2009-11-12 00:11:00 +0000
1208+++ plugin/md5/tests/t/md5-master.opt 2010-08-21 18:57:43 +0000
1209@@ -1,1 +1,1 @@
1210---plugin_add=md5
1211+--plugin-add=md5
1212
1213=== modified file 'plugin/pbxt/tests/t/basic_auto_increment-master.opt'
1214--- plugin/pbxt/tests/t/basic_auto_increment-master.opt 2010-08-12 22:49:45 +0000
1215+++ plugin/pbxt/tests/t/basic_auto_increment-master.opt 2010-08-21 18:57:43 +0000
1216@@ -1,1 +1,1 @@
1217---plugin_add=pbxt
1218+--plugin-add=pbxt
1219
1220=== modified file 'plugin/pbxt/tests/t/basic_create_nullable-master.opt'
1221--- plugin/pbxt/tests/t/basic_create_nullable-master.opt 2010-08-12 22:49:45 +0000
1222+++ plugin/pbxt/tests/t/basic_create_nullable-master.opt 2010-08-21 18:57:43 +0000
1223@@ -1,1 +1,1 @@
1224---plugin_add=pbxt
1225+--plugin-add=pbxt
1226
1227=== modified file 'plugin/pbxt/tests/t/basic_create_select-master.opt'
1228--- plugin/pbxt/tests/t/basic_create_select-master.opt 2010-08-12 22:49:45 +0000
1229+++ plugin/pbxt/tests/t/basic_create_select-master.opt 2010-08-21 18:57:43 +0000
1230@@ -1,1 +1,1 @@
1231---plugin_add=pbxt
1232+--plugin-add=pbxt
1233
1234=== modified file 'plugin/pbxt/tests/t/basic_create_table-master.opt'
1235--- plugin/pbxt/tests/t/basic_create_table-master.opt 2010-08-12 22:49:45 +0000
1236+++ plugin/pbxt/tests/t/basic_create_table-master.opt 2010-08-21 18:57:43 +0000
1237@@ -1,1 +1,1 @@
1238---plugin_add=pbxt
1239+--plugin-add=pbxt
1240
1241=== modified file 'plugin/pbxt/tests/t/basic_create_with_index-master.opt'
1242--- plugin/pbxt/tests/t/basic_create_with_index-master.opt 2010-08-12 22:49:45 +0000
1243+++ plugin/pbxt/tests/t/basic_create_with_index-master.opt 2010-08-21 18:57:43 +0000
1244@@ -1,1 +1,1 @@
1245---plugin_add=pbxt
1246+--plugin-add=pbxt
1247
1248=== modified file 'plugin/pbxt/tests/t/basic_delete_all_rows-master.opt'
1249--- plugin/pbxt/tests/t/basic_delete_all_rows-master.opt 2010-08-12 22:49:45 +0000
1250+++ plugin/pbxt/tests/t/basic_delete_all_rows-master.opt 2010-08-21 18:57:43 +0000
1251@@ -1,1 +1,1 @@
1252---plugin_add=pbxt
1253+--plugin-add=pbxt
1254
1255=== modified file 'plugin/pbxt/tests/t/basic_delete_row-master.opt'
1256--- plugin/pbxt/tests/t/basic_delete_row-master.opt 2010-08-12 22:49:45 +0000
1257+++ plugin/pbxt/tests/t/basic_delete_row-master.opt 2010-08-21 18:57:43 +0000
1258@@ -1,1 +1,1 @@
1259---plugin_add=pbxt
1260+--plugin-add=pbxt
1261
1262=== modified file 'plugin/pbxt/tests/t/basic_drop_table-master.opt'
1263--- plugin/pbxt/tests/t/basic_drop_table-master.opt 2010-08-12 22:49:45 +0000
1264+++ plugin/pbxt/tests/t/basic_drop_table-master.opt 2010-08-21 18:57:43 +0000
1265@@ -1,1 +1,1 @@
1266---plugin_add=pbxt
1267+--plugin-add=pbxt
1268
1269=== modified file 'plugin/pbxt/tests/t/basic_index_lookup-master.opt'
1270--- plugin/pbxt/tests/t/basic_index_lookup-master.opt 2010-08-12 22:49:45 +0000
1271+++ plugin/pbxt/tests/t/basic_index_lookup-master.opt 2010-08-21 18:57:43 +0000
1272@@ -1,1 +1,1 @@
1273---plugin_add=pbxt
1274+--plugin-add=pbxt
1275
1276=== modified file 'plugin/pbxt/tests/t/basic_innodb_truncate_table-master.opt'
1277--- plugin/pbxt/tests/t/basic_innodb_truncate_table-master.opt 2010-08-12 22:49:45 +0000
1278+++ plugin/pbxt/tests/t/basic_innodb_truncate_table-master.opt 2010-08-21 18:57:43 +0000
1279@@ -1,1 +1,1 @@
1280---plugin_add=pbxt
1281+--plugin-add=pbxt
1282
1283=== modified file 'plugin/pbxt/tests/t/basic_insert-master.opt'
1284--- plugin/pbxt/tests/t/basic_insert-master.opt 2010-08-12 22:49:45 +0000
1285+++ plugin/pbxt/tests/t/basic_insert-master.opt 2010-08-21 18:57:43 +0000
1286@@ -1,1 +1,1 @@
1287---plugin_add=pbxt
1288+--plugin-add=pbxt
1289
1290=== modified file 'plugin/pbxt/tests/t/basic_insert_multi_column-master.opt'
1291--- plugin/pbxt/tests/t/basic_insert_multi_column-master.opt 2010-08-12 22:49:45 +0000
1292+++ plugin/pbxt/tests/t/basic_insert_multi_column-master.opt 2010-08-21 18:57:43 +0000
1293@@ -1,1 +1,1 @@
1294---plugin_add=pbxt
1295+--plugin-add=pbxt
1296
1297=== modified file 'plugin/pbxt/tests/t/basic_insert_pkey_duplicate-master.opt'
1298--- plugin/pbxt/tests/t/basic_insert_pkey_duplicate-master.opt 2010-08-12 22:49:45 +0000
1299+++ plugin/pbxt/tests/t/basic_insert_pkey_duplicate-master.opt 2010-08-21 18:57:43 +0000
1300@@ -1,1 +1,1 @@
1301---plugin_add=pbxt
1302+--plugin-add=pbxt
1303
1304=== modified file 'plugin/pbxt/tests/t/basic_pkey_index_reverse_scan-master.opt'
1305--- plugin/pbxt/tests/t/basic_pkey_index_reverse_scan-master.opt 2010-08-12 22:49:45 +0000
1306+++ plugin/pbxt/tests/t/basic_pkey_index_reverse_scan-master.opt 2010-08-21 18:57:43 +0000
1307@@ -1,1 +1,1 @@
1308---plugin_add=pbxt
1309+--plugin-add=pbxt
1310
1311=== modified file 'plugin/pbxt/tests/t/basic_pkey_index_scan-master.opt'
1312--- plugin/pbxt/tests/t/basic_pkey_index_scan-master.opt 2010-08-12 22:49:45 +0000
1313+++ plugin/pbxt/tests/t/basic_pkey_index_scan-master.opt 2010-08-21 18:57:43 +0000
1314@@ -1,1 +1,1 @@
1315---plugin_add=pbxt
1316+--plugin-add=pbxt
1317
1318=== modified file 'plugin/pbxt/tests/t/basic_rename_table-master.opt'
1319--- plugin/pbxt/tests/t/basic_rename_table-master.opt 2010-08-12 22:49:45 +0000
1320+++ plugin/pbxt/tests/t/basic_rename_table-master.opt 2010-08-21 18:57:43 +0000
1321@@ -1,1 +1,1 @@
1322---plugin_add=pbxt
1323+--plugin-add=pbxt
1324
1325=== modified file 'plugin/pbxt/tests/t/basic_savepoint-master.opt'
1326--- plugin/pbxt/tests/t/basic_savepoint-master.opt 2010-08-12 22:49:45 +0000
1327+++ plugin/pbxt/tests/t/basic_savepoint-master.opt 2010-08-21 18:57:43 +0000
1328@@ -1,1 +1,1 @@
1329---plugin_add=pbxt
1330+--plugin-add=pbxt
1331
1332=== modified file 'plugin/pbxt/tests/t/basic_select-master.opt'
1333--- plugin/pbxt/tests/t/basic_select-master.opt 2010-08-12 22:49:45 +0000
1334+++ plugin/pbxt/tests/t/basic_select-master.opt 2010-08-21 18:57:43 +0000
1335@@ -1,1 +1,1 @@
1336---plugin_add=pbxt
1337+--plugin-add=pbxt
1338
1339=== modified file 'plugin/pbxt/tests/t/basic_select_multirow-master.opt'
1340--- plugin/pbxt/tests/t/basic_select_multirow-master.opt 2010-08-12 22:49:45 +0000
1341+++ plugin/pbxt/tests/t/basic_select_multirow-master.opt 2010-08-21 18:57:43 +0000
1342@@ -1,1 +1,1 @@
1343---plugin_add=pbxt
1344+--plugin-add=pbxt
1345
1346=== modified file 'plugin/pbxt/tests/t/basic_show_tables-master.opt'
1347--- plugin/pbxt/tests/t/basic_show_tables-master.opt 2010-08-12 22:49:45 +0000
1348+++ plugin/pbxt/tests/t/basic_show_tables-master.opt 2010-08-21 18:57:43 +0000
1349@@ -1,1 +1,1 @@
1350---plugin_add=pbxt
1351+--plugin-add=pbxt
1352
1353=== modified file 'plugin/pbxt/tests/t/basic_statement_rollback-master.opt'
1354--- plugin/pbxt/tests/t/basic_statement_rollback-master.opt 2010-08-12 22:49:45 +0000
1355+++ plugin/pbxt/tests/t/basic_statement_rollback-master.opt 2010-08-21 18:57:43 +0000
1356@@ -1,1 +1,1 @@
1357---plugin_add=pbxt
1358+--plugin-add=pbxt
1359
1360=== modified file 'plugin/pbxt/tests/t/basic_transaction-master.opt'
1361--- plugin/pbxt/tests/t/basic_transaction-master.opt 2010-08-12 22:49:45 +0000
1362+++ plugin/pbxt/tests/t/basic_transaction-master.opt 2010-08-21 18:57:43 +0000
1363@@ -1,1 +1,1 @@
1364---plugin_add=pbxt
1365+--plugin-add=pbxt
1366
1367=== modified file 'plugin/pbxt/tests/t/basic_transaction_autocommit-master.opt'
1368--- plugin/pbxt/tests/t/basic_transaction_autocommit-master.opt 2010-08-12 22:49:45 +0000
1369+++ plugin/pbxt/tests/t/basic_transaction_autocommit-master.opt 2010-08-21 18:57:43 +0000
1370@@ -1,1 +1,1 @@
1371---plugin_add=pbxt
1372+--plugin-add=pbxt
1373
1374=== modified file 'plugin/pbxt/tests/t/basic_transaction_rollback-master.opt'
1375--- plugin/pbxt/tests/t/basic_transaction_rollback-master.opt 2010-08-12 22:49:45 +0000
1376+++ plugin/pbxt/tests/t/basic_transaction_rollback-master.opt 2010-08-21 18:57:43 +0000
1377@@ -1,1 +1,1 @@
1378---plugin_add=pbxt
1379+--plugin-add=pbxt
1380
1381=== modified file 'plugin/pbxt/tests/t/basic_type_decimal-master.opt'
1382--- plugin/pbxt/tests/t/basic_type_decimal-master.opt 2010-08-12 22:49:45 +0000
1383+++ plugin/pbxt/tests/t/basic_type_decimal-master.opt 2010-08-21 18:57:43 +0000
1384@@ -1,1 +1,1 @@
1385---plugin_add=pbxt
1386+--plugin-add=pbxt
1387
1388=== modified file 'plugin/pbxt/tests/t/basic_update-master.opt'
1389--- plugin/pbxt/tests/t/basic_update-master.opt 2010-08-12 22:49:45 +0000
1390+++ plugin/pbxt/tests/t/basic_update-master.opt 2010-08-21 18:57:43 +0000
1391@@ -1,1 +1,1 @@
1392---plugin_add=pbxt
1393+--plugin-add=pbxt
1394
1395=== modified file 'plugin/pbxt/tests/t/basic_with_indexes-master.opt'
1396--- plugin/pbxt/tests/t/basic_with_indexes-master.opt 2010-08-12 22:49:45 +0000
1397+++ plugin/pbxt/tests/t/basic_with_indexes-master.opt 2010-08-21 18:57:43 +0000
1398@@ -1,1 +1,1 @@
1399---plugin_add=pbxt
1400+--plugin-add=pbxt
1401
1402=== modified file 'plugin/pool_of_threads/tests/t/pool_of_threads-master.opt'
1403--- plugin/pool_of_threads/tests/t/pool_of_threads-master.opt 2009-11-12 00:44:38 +0000
1404+++ plugin/pool_of_threads/tests/t/pool_of_threads-master.opt 2010-08-21 18:57:43 +0000
1405@@ -1,1 +1,1 @@
1406---plugin_add=pool_of_threads --scheduler=pool_of_threads
1407+--plugin-add=pool_of_threads --scheduler=pool_of_threads
1408
1409=== modified file 'plugin/single_thread/tests/t/single_thread-master.opt'
1410--- plugin/single_thread/tests/t/single_thread-master.opt 2009-11-12 00:44:37 +0000
1411+++ plugin/single_thread/tests/t/single_thread-master.opt 2010-08-21 18:57:43 +0000
1412@@ -1,1 +1,1 @@
1413---plugin_add=single_thread --scheduler=single_thread
1414+--plugin-add=single_thread --scheduler=single_thread
1415
1416=== modified file 'plugin/sleep/tests/t/sleep-master.opt'
1417--- plugin/sleep/tests/t/sleep-master.opt 2010-01-13 08:20:13 +0000
1418+++ plugin/sleep/tests/t/sleep-master.opt 2010-08-21 18:57:43 +0000
1419@@ -1,2 +1,2 @@
1420---plugin_add=sleep
1421+--plugin-add=sleep
1422
1423
1424=== modified file 'plugin/tableprototester/tests/t/basic-master.opt'
1425--- plugin/tableprototester/tests/t/basic-master.opt 2010-02-05 01:20:18 +0000
1426+++ plugin/tableprototester/tests/t/basic-master.opt 2010-08-21 18:57:43 +0000
1427@@ -1,1 +1,1 @@
1428---plugin_add=tableprototester
1429+--plugin-add=tableprototester
1430
1431=== modified file 'plugin/tableprototester/tests/t/drop_table-master.opt'
1432--- plugin/tableprototester/tests/t/drop_table-master.opt 2010-02-05 01:34:36 +0000
1433+++ plugin/tableprototester/tests/t/drop_table-master.opt 2010-08-21 18:57:43 +0000
1434@@ -1,1 +1,1 @@
1435---plugin_add=tableprototester
1436+--plugin-add=tableprototester
1437
1438=== modified file 'plugin/tableprototester/tests/t/invalid_table_collation-master.opt'
1439--- plugin/tableprototester/tests/t/invalid_table_collation-master.opt 2010-07-05 03:25:34 +0000
1440+++ plugin/tableprototester/tests/t/invalid_table_collation-master.opt 2010-08-21 18:57:43 +0000
1441@@ -1,1 +1,1 @@
1442---plugin_add=tableprototester
1443+--plugin-add=tableprototester
1444
1445=== modified file 'plugin/tableprototester/tests/t/missing_engine-master.opt'
1446--- plugin/tableprototester/tests/t/missing_engine-master.opt 2010-02-05 01:34:36 +0000
1447+++ plugin/tableprototester/tests/t/missing_engine-master.opt 2010-08-21 18:57:43 +0000
1448@@ -1,1 +1,1 @@
1449---plugin_add=tableprototester
1450+--plugin-add=tableprototester
1451
1452=== modified file 'plugin/tableprototester/tests/t/too_many_enum_values-master.opt'
1453--- plugin/tableprototester/tests/t/too_many_enum_values-master.opt 2010-06-03 04:50:43 +0000
1454+++ plugin/tableprototester/tests/t/too_many_enum_values-master.opt 2010-08-21 18:57:43 +0000
1455@@ -1,1 +1,1 @@
1456---plugin_add=tableprototester
1457+--plugin-add=tableprototester
1458
1459=== modified file 'tests/t/subselect_notembedded-master.opt'
1460--- tests/t/subselect_notembedded-master.opt 2010-08-05 20:33:18 +0000
1461+++ tests/t/subselect_notembedded-master.opt 2010-08-21 18:57:43 +0000
1462@@ -1,1 +1,1 @@
1463---thread_stack=1048576
1464+--thread-stack=1048576