From 264bc66903f89e562077e207458fcb7882b04ed4 Mon Sep 17 00:00:00 2001 From: lzxddz Date: Fri, 17 Oct 2025 18:06:54 +0800 Subject: [PATCH] Refactor repo structure: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove unsed files: KNOWN_BUGS.txt/INSTALL-WIN-SOURCE/CREDITS/appveyor.yml/.gitlab-ci.yml Move my-config.cnf → scripts/ and rename to eloqsql.cnf new symbol link for eloqsql ( eloqsql -> mariadbd eloqsql-cli -> mariadb eloqsql-safe -> mariadbd-safe eloqsql-safe-helper -> mariadbd-safe-helper eloqsql-install-db -> mariadb-install-db ) Rename mysql-test/mono_basic -> mysql-test/eloq_basic Rename mysql-test/mono_main -> mysql-test/eloq_main Rename mysql-test/mono_multi -> mysql-test/eloq_multi --- .gitlab-ci.yml | 375 ------------------ CMakeLists.txt | 3 +- CREDITS | 57 --- INSTALL-WIN-SOURCE | 3 - KNOWN_BUGS.txt | 15 - README.md | 16 +- appveyor.yml | 30 -- cmake/mysql_add_executable.cmake | 30 ++ cmake/symlinks.cmake | 27 ++ concourse/scripts/main.bash | 8 +- concourse/scripts/main.ent.bash | 8 +- concourse/scripts/pr.ent.bash | 8 +- scripts/CMakeLists.txt | 1 + my-config.cnf => scripts/eloqsql.cnf | 0 .../{mono_basic => eloq_basic}/disabled.def | 0 .../include/have_eloq.inc | 0 .../include/have_hash_partition.inc | 0 .../include/have_range_partition.inc | 0 .../include/update_use_source_eloq.inc | 0 .../{mono_basic => eloq_basic}/my.cnf | 0 .../r/alter_db.result | 0 .../r/alter_table.result | 0 .../r/alter_table_recovery.result | 0 .../r/auto_commit.result | 0 .../r/batch_pk_load_s.result | 0 .../r/collation_restriction.result | 0 .../r/create_drop_index.result | 0 .../r/create_drop_table_recovery.result | 0 .../r/data_store_error.result | 0 .../r/data_type.result | 0 .../r/deadlock_handling.result | 0 .../r/drop_table.result | 0 .../r/fault_inject_term_neg_Execute.result | 0 .../r/flush_undo_while_ckpt.result | 0 .../r/isolation_level_for_locking.result | 0 .../r/isolation_level_for_mvcc.result | 0 .../r/isolation_level_for_occ.result | 0 .../r/key_cache.result | 0 .../r/magic_table_name.result | 0 .../r/merge_scanner_wset.result | 0 .../r/mvcc_archives_recycle.result | 0 ..._read_after_flushing_deleted_record.result | 0 ...ue_sk_after_flushing_deleted_record.result | 0 .../r/mvcc_scan.result | 0 ..._scan_after_flushing_deleted_record.result | 0 .../r/mvcc_scan_sk.result | 0 .../r/mvcc_unique_sk_lookup.result | 0 .../r/poor_performance.result | 0 .../r/primary_key.result | 0 .../r/pushdown_cond.result | 0 .../r/range_split_keycache.result | 0 .../r/read_committed_sk_scan.result | 0 .../{mono_basic => eloq_basic}/r/rnd.result | 0 .../r/s_scan_remainer_lock.result | 0 .../r/secondary_key.result | 0 .../r/select_for_update_and_share.result | 0 .../r/select_for_update_and_share_occ.result | 0 .../r/single_auto_increment.result | 0 .../r/single_dead_lock_check.result | 0 .../r/single_node.result | 0 .../r/statistics.result | 0 .../r/temporary_table.result | 0 .../r/unique_sk_lookup.result | 0 .../r/unsupported_sql.result | 0 .../r/update_record_with_sk.result | 0 .../r/upsert_table_recovery.result | 0 .../r/write_log_unknown.result | 0 .../t/alter_db.test | 0 .../t/alter_table.test | 0 .../t/alter_table_recovery.test | 0 .../t/auto_commit.test | 0 .../t/batch_pk_load_s.test | 0 .../t/collation_restriction.test | 0 .../t/create_drop_index.test | 0 .../t/create_drop_table_recovery.test | 0 .../t/data_store_error.test | 0 .../t/data_type.test | 0 .../t/deadlock_handling.cnf | 0 .../t/deadlock_handling.test | 0 .../t/drop_table.test | 0 .../t/fault_inject_term_neg_Execute.test | 0 .../t/flush_undo_while_ckpt.cnf | 0 .../t/flush_undo_while_ckpt.test | 0 .../t/isolation_level_for_locking.cnf | 0 .../t/isolation_level_for_locking.test | 0 .../t/isolation_level_for_mvcc.cnf | 0 .../t/isolation_level_for_mvcc.test | 0 .../t/isolation_level_for_occ.cnf | 0 .../t/isolation_level_for_occ.test | 0 .../t/key_cache.cnf | 0 .../t/key_cache.test | 0 .../t/magic_table_name.test | 0 .../t/merge_scanner_wset.test | 0 .../t/mvcc_archives_recycle.cnf | 0 .../t/mvcc_archives_recycle.test | 0 ...vcc_read_after_flushing_deleted_record.cnf | 0 ...cc_read_after_flushing_deleted_record.test | 0 ...nique_sk_after_flushing_deleted_record.cnf | 0 ...ique_sk_after_flushing_deleted_record.test | 0 .../t/mvcc_scan.cnf | 0 .../t/mvcc_scan.test | 0 ...vcc_scan_after_flushing_deleted_record.cnf | 0 ...cc_scan_after_flushing_deleted_record.test | 0 .../t/mvcc_scan_sk.cnf | 0 .../t/mvcc_scan_sk.test | 0 .../t/mvcc_scan_sk_rc_isolvl.cnf | 0 .../t/mvcc_scan_sk_rc_isolvl.test | 0 .../t/mvcc_unique_sk_lookup.cnf | 0 .../t/mvcc_unique_sk_lookup.test | 0 .../t/poor_performance.cnf | 0 .../t/poor_performance.test | 0 .../t/primary_key.test | 0 .../t/pushdown_cond.test | 0 .../t/range_split_keycache.cnf | 0 .../t/range_split_keycache.test | 0 .../t/read_committed_sk_scan.test | 0 .../{mono_basic => eloq_basic}/t/rnd.test | 0 .../t/s_scan_remainer_lock.test | 0 .../t/secondary_key.test | 0 .../t/select_for_update_and_share.cnf | 0 .../t/select_for_update_and_share.test | 0 .../t/select_for_update_and_share_occ.cnf | 0 .../t/select_for_update_and_share_occ.test | 0 .../t/single_auto_increment.test | 0 .../t/single_dead_lock_check.cnf | 0 .../t/single_dead_lock_check.test | 0 .../t/single_node.cnf | 0 .../t/single_node.test | 0 .../t/statistics.test | 0 .../t/temporary_table.test | 0 .../t/unique_sk_lookup.test | 0 .../t/unsupported_sql.test | 0 .../t/update_record_with_sk.test | 0 .../t/upsert_table_recovery.test | 0 .../t/write_log_unknown.test | 0 .../{mono_main => eloq_main}/disabled.def | 0 .../include/bytes_eloq.inc | 0 .../include/common-tests_eloq.inc | 0 .../include/ctype_czech_eloq.inc | 0 .../include/ctype_eloq_like.inc | 0 .../include/ctype_filesort_eloq.inc | 0 .../ctype_like_cond_propagation_eloq.inc | 0 .../include/ctype_like_ignorable_eloq.inc | 0 .../include/ctype_like_range_f1f2_eloq.inc | 0 .../ctype_like_range_mdev14350_eloq.inc | 0 .../include/ctype_myanmar_eloq.inc | 0 .../include/ctype_numconv_eloq.inc | 0 .../include/ctype_pad_all_engines_eloq.inc | 0 .../include/ctype_thai_eloq.inc | 0 .../include/ctype_unescape_eloq.inc | 0 .../include/ctype_utf8_ilseq_eloq.inc | 0 .../include/dbt3_s001_eloq.inc | 0 .../include/default_charset_eloq.inc | 0 ...equal_fields_propagation_datetime_eloq.inc | 0 .../include/func_hybrid_type_eloq.inc | 0 .../include/func_str_ascii_checksum_eloq.inc | 0 .../include/function_defaults_eloq.inc | 0 .../function_defaults_notembedded_eloq.inc | 0 .../include/have_eloq.inc | 0 .../include/have_utf8mb4_eloq.inc | 0 .../include/ipv6_clients_eloq.inc | 0 .../include/mrr_tests_eloq.inc | 0 .../include/mysqldump_eloq.inc | 0 .../include/query_cache_sql_prepare_eloq.inc | 0 .../switch_to_mysql_global_priv_eloq.inc | 0 .../include/switch_to_mysql_user_eloq.inc | 0 .../include/type_hrtime_eloq.inc | 0 .../type_temporal_zero_default_eloq.inc | 0 .../include/update_use_source_eloq.inc | 0 .../include/world_schema_eloq.inc | 0 .../include/world_schema_eloq1.inc | 0 .../include/world_schema_eloq2.inc | 0 .../{mono_main => eloq_main}/my.cnf | 0 .../{mono_main => eloq_main}/r/1st.result | 0 .../r/aborted_clients.result | 0 .../r/adddate_454.result | 0 .../{mono_main => eloq_main}/r/alias.result | 0 .../r/almost_full.result | 0 .../r/alter_events.result | 0 .../r/alter_table,aria.rdiff | 0 .../r/alter_table,heap.rdiff | 0 .../r/alter_table-big.result | 0 .../r/alter_table.result | 0 .../r/alter_table_autoinc-5574.result | 0 .../r/alter_table_debug.result | 0 .../r/alter_table_errors.result | 0 .../r/alter_table_mdev539_maria.result | 0 .../r/alter_table_mdev539_myisam.result | 0 .../r/alter_table_online.result | 0 .../r/alter_table_trans.result | 0 .../r/alter_user.result | 0 .../{mono_main => eloq_main}/r/analyze.result | 0 .../r/analyze_debug.result | 0 .../r/analyze_format_json.result | 0 .../r/analyze_stmt.result | 0 .../r/analyze_stmt_orderby.result | 0 .../r/analyze_stmt_privileges.result | 0 .../r/analyze_stmt_privileges2.result | 0 .../r/analyze_stmt_slow_query_log.result | 0 .../{mono_main => eloq_main}/r/ansi.result | 0 .../r/aria_icp_debug.result | 0 .../r/assign_key_cache.result | 0 .../r/assign_key_cache_debug.result | 0 .../r/auth_named_pipe.result | 0 .../r/auth_rpl.result | 0 .../r/auto_increment.result | 0 .../r/auto_increment_ranges_innodb.result | 0 .../r/auto_increment_ranges_myisam.result | 0 .../r/backup_aria.result | 0 .../r/backup_interaction.result | 0 .../r/backup_lock.result | 0 .../r/backup_lock_binlog.result | 0 .../r/backup_lock_debug.result | 0 .../r/backup_locks.result | 0 .../r/backup_log.result | 0 .../r/backup_priv.result | 0 .../r/backup_stages.result | 0 .../r/backup_syntax.result | 0 .../r/bad_frm_crash_5029.result | 0 .../r/bench_count_distinct.result | 0 .../{mono_main => eloq_main}/r/bigint.result | 0 .../{mono_main => eloq_main}/r/binary.result | 0 .../r/binary_to_hex.result | 0 .../r/bind_address_resolution.result | 0 .../r/blackhole.result | 0 .../r/blackhole_plugin.result | 0 .../{mono_main => eloq_main}/r/bool.result | 0 .../r/bootstrap.result | 0 .../r/bootstrap_innodb.result | 0 .../r/brackets.result | 0 .../r/bug12427262.result | 0 .../r/bug13633383.result | 0 .../r/bug39022.result | 0 .../r/bug46760.result | 0 .../r/bug47671.result | 0 .../r/bug58669.result | 0 .../r/bulk_replace.result | 0 .../r/cache_innodb.result | 0 .../r/cache_temporal_4265.result | 0 .../{mono_main => eloq_main}/r/case.result | 0 .../{mono_main => eloq_main}/r/cast.result | 0 .../r/change_user.result | 0 .../r/change_user_notembedded.result | 0 .../r/charset_client_win.result | 0 .../{mono_main => eloq_main}/r/check.result | 0 .../r/check_constraint.result | 0 .../r/check_constraint_innodb.result | 0 .../r/check_constraint_show.result | 0 .../cli_options_force_protocol_not_win.result | 0 .../r/cli_options_force_protocol_win.result | 0 .../r/client_xml.result | 0 .../r/column_compression.result | 0 .../r/column_compression_parts.result | 0 .../r/column_compression_rpl.result | 0 .../r/column_compression_utf16.result | 0 .../r/comment_column.result | 0 .../r/comment_column2.result | 0 .../r/comment_database.result | 0 .../r/comment_index.result | 0 .../r/comment_table.result | 0 .../r/comments.result | 0 .../{mono_main => eloq_main}/r/commit.result | 0 .../r/commit_1innodb.result | 0 .../{mono_main => eloq_main}/r/compare.result | 0 .../r/compound.result | 0 .../r/compress.result | 0 .../r/concurrent_innodb_safelog.result | 0 .../r/concurrent_innodb_unsafelog.result | 0 .../r/connect-abstract.result | 0 .../{mono_main => eloq_main}/r/connect.result | 0 .../r/connect2.result | 0 .../r/connect_debug.result | 0 .../r/consistent_snapshot.result | 0 .../r/constraints.result | 0 .../r/contributors.result | 0 .../r/count_distinct.result | 0 .../r/count_distinct2.result | 0 .../r/count_distinct3.result | 0 .../r/crash_commit_before.result | 0 .../r/create-big.result | 0 .../r/create-uca.result | 0 .../{mono_main => eloq_main}/r/create.result | 0 .../r/create_delayed.result | 0 .../r/create_drop_binlog.result | 0 .../r/create_drop_db.result | 0 .../r/create_drop_event.result | 0 .../r/create_drop_function.result | 0 .../r/create_drop_index.result | 0 .../r/create_drop_procedure.result | 0 .../r/create_drop_role.result | 0 .../r/create_drop_server.result | 0 .../r/create_drop_trigger.result | 0 .../r/create_drop_udf.result | 0 .../r/create_drop_user.result | 0 .../r/create_drop_view.result | 0 .../r/create_not_windows.result | 0 .../r/create_or_replace.result | 0 .../r/create_or_replace2.result | 0 .../r/create_or_replace_permission.result | 0 .../r/create_replace_tmp.result | 0 .../r/create_select_tmp.result | 0 .../r/create_user.result | 0 .../r/create_utf8.result | 0 .../r/create_w_max_indexes_128.result | 0 .../r/create_w_max_indexes_64.result | 0 .../r/cte_cycle.result | 0 .../r/cte_grant.result | 0 .../r/cte_nonrecursive.result | 0 .../r/cte_nonrecursive_not_embedded.result | 0 .../r/cte_recursive.result | 0 .../r/cte_recursive_not_embedded.result | 0 .../r/ctype_ascii.result | 0 .../r/ctype_big5.result | 0 .../r/ctype_binary.result | 0 .../r/ctype_collate.result | 0 .../r/ctype_cp1250_ch.result | 0 .../r/ctype_cp1251.result | 0 .../r/ctype_cp850.result | 0 .../r/ctype_cp932.result | 0 .../r/ctype_cp932_binlog_row.result | 0 .../r/ctype_cp932_binlog_stm.result | 0 .../r/ctype_create.result | 0 .../r/ctype_dec8.result | 0 .../r/ctype_errors.result | 0 .../r/ctype_eucjpms.result | 0 .../r/ctype_euckr.result | 0 .../r/ctype_filename.result | 0 .../r/ctype_filesystem.result | 0 .../r/ctype_gb2312.result | 0 .../r/ctype_gbk.result | 0 .../r/ctype_gbk_binlog.result | 0 .../r/ctype_gbk_export_import.result | 0 .../r/ctype_hebrew.result | 0 .../r/ctype_latin1.result | 0 .../r/ctype_latin1_de.result | 0 .../r/ctype_latin2.result | 0 .../r/ctype_latin2_ch.result | 0 .../r/ctype_ldml.result | 0 .../r/ctype_like_range.result | 0 .../r/ctype_many.result | 0 .../r/ctype_mb.result | 0 .../r/ctype_nopad_8bit.result | 0 .../r/ctype_partitions.result | 0 .../r/ctype_recoding.result | 0 .../r/ctype_sjis.result | 0 .../r/ctype_swe7.result | 0 .../r/ctype_tis620.result | 0 .../r/ctype_uca.result | 0 .../r/ctype_uca_innodb.result | 0 .../r/ctype_uca_partitions.result | 0 .../r/ctype_ucs.result | 0 .../r/ctype_ucs2_def.result | 0 .../r/ctype_ucs2_query_cache.result | 0 .../r/ctype_ucs2_uca.result | 0 .../r/ctype_ujis.result | 0 .../r/ctype_ujis_ucs2.result | 0 .../r/ctype_upgrade.result | 0 .../r/ctype_utf16.result | 0 .../r/ctype_utf16_def.result | 0 .../r/ctype_utf16_uca.result | 0 .../r/ctype_utf16le.result | 0 .../r/ctype_utf32.result | 0 .../r/ctype_utf32_def.result | 0 .../r/ctype_utf32_uca.result | 0 .../r/ctype_utf8.result | 0 .../r/ctype_utf8_def_upgrade.result | 0 .../r/ctype_utf8_uca.result | 0 .../r/ctype_utf8mb4.result | 0 .../r/ctype_utf8mb4_heap.result | 0 .../r/ctype_utf8mb4_innodb.result | 0 .../r/ctype_utf8mb4_myisam.result | 0 .../r/ctype_utf8mb4_uca.result | 0 .../r/custom_aggregate_functions.result | 0 .../r/custom_aggregates_i_s.result | 0 .../r/date_formats.result | 0 .../r/datetime_456.result | 0 .../r/ddl_i18n_koi8r.result | 0 .../r/ddl_i18n_utf8.result | 0 .../r/deadlock_ftwrl.result | 0 .../r/deadlock_innodb.result | 0 .../r/debug_sync.result | 0 .../{mono_main => eloq_main}/r/default.result | 0 .../r/default_debug.result | 0 .../r/default_session.result | 0 .../r/default_storage_engine.result | 0 .../{mono_main => eloq_main}/r/delayed.result | 0 .../r/delayed_blob.result | 0 .../{mono_main => eloq_main}/r/delete.result | 0 .../r/delete_innodb.result | 0 .../r/delete_returning.result | 0 .../r/delete_returning_grant.result | 0 .../r/delete_use_source.result | 0 .../delimiter_command_case_sensitivity.result | 0 .../r/deprecated_features.result | 0 .../{mono_main => eloq_main}/r/derived.result | 0 .../r/derived_cond_pushdown.result | 0 .../r/derived_opt.result | 0 .../r/derived_split_innodb.result | 0 .../r/derived_view.result | 0 .../r/dirty_close.result | 0 .../r/distinct.result | 0 .../{mono_main => eloq_main}/r/drop.result | 0 .../r/drop_bad_db_type.result | 0 .../r/drop_combinations.result | 0 .../r/drop_table_force.result | 0 .../{mono_main => eloq_main}/r/dyncol.result | 0 .../r/empty_server_name-8224.result | 0 .../r/empty_string_literal.result | 0 .../r/empty_table.result | 0 .../r/empty_user_table.result | 0 .../r/endspace.result | 0 .../r/enforce_storage_engine.result | 0 .../r/enforce_storage_engine_opt.result | 0 .../r/engine_error_in_alter-8453.result | 0 .../r/error_simulation.result | 0 .../{mono_main => eloq_main}/r/errors.result | 0 .../r/events_1.result | 0 .../r/events_2.result | 0 .../r/events_bugs.result | 0 .../r/events_embedded.result | 0 .../r/events_grant.result | 0 .../r/events_logs_tests.result | 0 .../r/events_microsec.result | 0 .../r/events_restart.result | 0 .../r/events_scheduling.result | 0 .../r/events_slowlog.result | 0 .../r/events_stress.result | 0 .../r/events_time_zone.result | 0 .../r/events_trans.result | 0 .../r/events_trans_notembedded.result | 0 .../{mono_main => eloq_main}/r/except.result | 0 .../r/except_all.result | 0 .../r/execution_constants.result | 0 .../{mono_main => eloq_main}/r/explain.result | 0 .../r/explain_json.result | 0 .../r/explain_json_format_partitions.result | 0 .../r/explain_json_innodb.result | 0 .../r/explain_non_select.result | 0 .../r/explain_slowquerylog.result | 0 .../r/ext_key_noPK_6794.result | 0 .../r/failed_auth_3909.result | 0 .../r/failed_auth_unixsocket.result | 0 .../r/fast_prefix_index_fetch_innodb.result | 0 .../r/features,ps.rdiff | 0 .../r/features.result | 0 .../r/fetch_first.result | 0 .../r/file_contents.result | 0 .../r/filesort_bad_i_s-7585.result | 0 .../r/filesort_debug.result | 0 .../r/fix_priv_tables.result | 0 .../r/flush-innodb-notembedded.result | 0 .../r/flush-innodb.result | 0 .../{mono_main => eloq_main}/r/flush.result | 0 .../{mono_main => eloq_main}/r/flush2.result | 0 .../r/flush_and_binlog.result | 0 .../r/flush_block_commit.result | 0 .../r/flush_block_commit_notembedded.result | 0 .../r/flush_logs_not_windows.result | 0 .../r/flush_notembedded.result | 0 .../r/flush_read_lock.result | 0 .../r/flush_read_lock_kill.result | 0 .../r/flush_ssl.result | 0 .../r/flush_table.result | 0 .../r/foreign_key.result | 0 .../r/frm-debug.result | 0 .../r/frm_bad_row_type-7333.result | 0 .../r/fulltext.result | 0 .../r/fulltext2.result | 0 .../r/fulltext3.result | 0 .../r/fulltext_cache.result | 0 .../r/fulltext_charsets.result | 0 .../r/fulltext_derived_4257.result | 0 .../r/fulltext_derived_4316.result | 0 .../r/fulltext_distinct.result | 0 .../r/fulltext_left_join.result | 0 .../r/fulltext_multi.result | 0 .../r/fulltext_order_by.result | 0 .../r/fulltext_update.result | 0 .../r/fulltext_var.result | 0 .../r/func_analyse.result | 0 .../r/func_bit.result | 0 .../r/func_compress.result | 0 .../r/func_concat.result | 0 .../r/func_crypt.result | 0 .../r/func_date_add.result | 0 .../r/func_debug.result | 0 .../r/func_default.result | 0 .../r/func_des_encrypt.result | 0 .../r/func_digest.result | 0 .../r/func_encrypt.result | 0 .../r/func_encrypt_nossl.result | 0 .../r/func_encrypt_ucs2.result | 0 .../r/func_equal.result | 0 .../r/func_extract.result | 0 .../r/func_gconcat.result | 0 .../r/func_group.result | 0 .../r/func_group_innodb.result | 0 .../r/func_hybrid_type.result | 0 .../{mono_main => eloq_main}/r/func_if.result | 0 .../{mono_main => eloq_main}/r/func_in.result | 0 .../r/func_int.result | 0 .../r/func_isnull.result | 0 .../r/func_json.result | 0 .../r/func_like.result | 0 .../r/func_math.result | 0 .../r/func_misc.result | 0 .../{mono_main => eloq_main}/r/func_op.result | 0 .../r/func_regexp.result | 0 .../r/func_regexp_pcre.result | 0 .../r/func_regexp_pcre_debug.result | 0 .../r/func_rollback.result | 0 .../r/func_sapdb.result | 0 .../r/func_set.result | 0 .../r/func_str.result | 0 .../r/func_system.result | 0 .../r/func_test.result | 0 .../r/func_time.result | 0 .../r/func_time_hires.result | 0 .../r/func_time_round.result | 0 .../r/func_timestamp.result | 0 .../r/func_weight_string.result | 0 .../r/function_defaults.result | 0 .../r/function_defaults_innodb.result | 0 .../r/function_defaults_notembedded.result | 0 .../{mono_main => eloq_main}/r/gcc296.result | 0 .../r/get_diagnostics.result | 0 .../r/gis-alter_table_online.result | 0 .../r/gis-debug.result | 0 .../r/gis-json.result | 0 .../r/gis-loaddata.result | 0 .../r/gis-precise.result | 0 .../r/gis-rt-precise.result | 0 .../r/gis-rtree.result | 0 .../{mono_main => eloq_main}/r/gis.result | 0 .../r/gis_notembedded.result | 0 .../{mono_main => eloq_main}/r/grant.result | 0 .../{mono_main => eloq_main}/r/grant2.result | 0 .../{mono_main => eloq_main}/r/grant3.result | 0 .../{mono_main => eloq_main}/r/grant4.result | 0 .../{mono_main => eloq_main}/r/grant5.result | 0 .../r/grant_4332.result | 0 .../r/grant_binlog_replay.result | 0 .../r/grant_cache_no_prot.result | 0 .../r/grant_cache_ps_prot.result | 0 .../r/grant_explain_non_select.result | 0 .../r/grant_kill.result | 0 .../r/grant_lowercase.result | 0 .../r/grant_lowercase_fs.result | 0 .../r/grant_master_admin.result | 0 .../r/grant_not_windows.result | 0 .../r/grant_read_only.result | 0 .../r/grant_repair.result | 0 .../r/grant_server.result | 0 .../r/grant_slave_admin.result | 0 .../r/grant_slave_monitor.result | 0 .../r/greedy_optimizer.result | 0 .../r/group_by.result | 0 .../r/group_by_innodb.result | 0 .../r/group_by_null.result | 0 .../r/group_min_max.result | 0 .../r/group_min_max_innodb.result | 0 .../r/handler_read_last.result | 0 .../r/handlersocket.result | 0 .../{mono_main => eloq_main}/r/having.result | 0 .../r/having_cond_pushdown.result | 0 .../{mono_main => eloq_main}/r/help.result | 0 .../r/host_cache_size_functionality.result | 0 .../r/huge_frm-6224.result | 0 .../r/ignored_index.result | 0 .../r/ignored_index_innodb.result | 0 .../r/implicit_char_to_num_conversion.result | 0 .../r/implicit_commit.result | 0 .../r/in_datetime_241.result | 0 .../r/in_subq_cond_pushdown.result | 0 .../r/index_intersect.result | 0 .../r/index_intersect_innodb.result | 0 .../r/index_merge_innodb.result | 0 .../r/index_merge_myisam.result | 0 .../r/information_schema-big.result | 0 .../r/information_schema.result | 0 .../r/information_schema2.result | 0 .../r/information_schema_all_engines.result | 0 .../r/information_schema_chmod.result | 0 .../r/information_schema_db.result | 0 .../r/information_schema_inno.result | 0 .../r/information_schema_linux.result | 0 .../r/information_schema_parameters.result | 0 .../r/information_schema_part.result | 0 .../r/information_schema_prepare.result | 0 .../r/information_schema_routines.result | 0 .../r/information_schema_stats.result | 0 .../r/init_connect.result | 0 .../r/init_connection_query_cache.result | 0 .../r/init_file.result | 0 .../r/init_file_longline_3816.result | 0 .../r/init_file_set_password-7656.result | 0 .../r/innodb_bug878769.result | 0 .../r/innodb_ext_key,off.rdiff | 0 .../r/innodb_ext_key.result | 0 .../r/innodb_group.result | 0 .../r/innodb_icp.result | 0 .../r/innodb_icp_debug.result | 0 .../r/innodb_ignore_builtin.result | 0 .../r/innodb_load_xa.result | 0 .../r/innodb_mrr_cpk.result | 0 .../r/innodb_mysql_lock.result | 0 .../r/innodb_mysql_lock2.result | 0 .../r/innodb_mysql_sync.result | 0 .../r/innodb_utf8.result | 0 .../{mono_main => eloq_main}/r/insert.result | 0 .../r/insert_debug.result | 0 .../r/insert_innodb.result | 0 .../r/insert_notembedded.result | 0 .../r/insert_returning.result | 0 .../r/insert_returning_datatypes.result | 0 .../r/insert_select.result | 0 .../r/insert_update.result | 0 .../r/insert_update_autoinc-7150.result | 0 .../r/intersect.result | 0 .../r/intersect_all.result | 0 .../r/invisible_binlog.result | 0 .../r/invisible_field.result | 0 .../r/invisible_field_debug.result | 0 .../r/invisible_field_grant_completely.result | 0 .../r/invisible_field_grant_system.result | 0 .../r/invisible_partition.result | 0 .../r/ipv4_and_ipv6.result | 0 .../r/ipv4_as_ipv6.result | 0 .../{mono_main => eloq_main}/r/ipv6.result | 0 .../{mono_main => eloq_main}/r/join.result | 0 .../r/join_cache.result | 0 .../r/join_crash.result | 0 .../r/join_nested.result | 0 .../r/join_nested_jcl6.result | 0 .../r/join_optimizer.result | 0 .../r/join_outer.result | 0 .../r/join_outer_innodb.result | 0 .../r/join_outer_jcl6.result | 0 .../{mono_main => eloq_main}/r/key.result | 0 .../r/key_cache.result | 0 .../r/key_diff.result | 0 .../r/key_primary.result | 0 .../{mono_main => eloq_main}/r/keyread.result | 0 .../r/keywords.result | 0 .../{mono_main => eloq_main}/r/kill-2.result | 0 .../{mono_main => eloq_main}/r/kill.result | 0 .../r/kill_processlist-6619.result | 0 .../r/kill_query-6728.result | 0 .../r/large_pages.result | 0 .../r/last_value.result | 0 .../{mono_main => eloq_main}/r/limit.result | 0 .../r/limit_rows_examined.result | 0 .../r/loaddata.result | 0 .../r/loaddata_autocom_innodb.result | 0 .../{mono_main => eloq_main}/r/loadxml.result | 0 .../{mono_main => eloq_main}/r/locale.result | 0 .../{mono_main => eloq_main}/r/lock.result | 0 .../r/lock_kill.result | 0 .../r/lock_multi.result | 0 .../r/lock_multi_bug38499.result | 0 .../r/lock_multi_bug38691.result | 0 .../r/lock_sync.result | 0 .../r/lock_tables_lost_commit.result | 0 .../r/lock_user.result | 0 .../r/lock_view.result | 0 .../r/locked_temporary-5955.result | 0 .../r/locking_clause.result | 0 .../r/log_errchk.result | 0 .../r/log_slow.result | 0 .../r/log_slow_debug.result | 0 .../r/log_state.result | 0 .../r/log_state_bug33693.result | 0 .../r/log_tables-big.result | 0 .../r/log_tables.result | 0 .../r/log_tables_debug.result | 0 .../r/log_tables_upgrade.result | 0 .../r/long_host.result | 0 .../r/long_tmpdir.result | 0 .../r/long_unique.result | 0 .../r/long_unique_bugs.result | 0 .../r/long_unique_bugs_replication.result | 0 .../r/long_unique_debug.result | 0 .../r/long_unique_delayed.result | 0 .../r/long_unique_innodb.result | 0 .../r/long_unique_update.result | 0 .../r/long_unique_using_hash.result | 0 .../r/lowercase_fs_off.result | 0 .../r/lowercase_fs_on.result | 0 .../r/lowercase_mixed_tmpdir.result | 0 .../r/lowercase_mixed_tmpdir_innodb.result | 0 .../r/lowercase_table.result | 0 .../r/lowercase_table2.result | 0 .../r/lowercase_table4.result | 0 .../r/lowercase_table5.result | 0 .../r/lowercase_table_grant.result | 0 .../r/lowercase_table_qcache.result | 0 .../r/lowercase_utf8.result | 0 .../r/lowercase_view.result | 0 .../r/max_password_errors.result | 0 .../r/max_statement_time.result | 0 .../r/mdev-21101.result | 0 .../r/mdev13607.result | 0 .../r/mdev19198.result | 0 .../{mono_main => eloq_main}/r/mdev316.result | 0 .../{mono_main => eloq_main}/r/mdev375.result | 0 .../r/mdev6830.result | 0 .../r/mdev_14586.result | 0 .../r/mdev_19276.result | 0 .../r/mdev_22370.result | 0 .../{mono_main => eloq_main}/r/mdl.result | 0 .../r/mdl_sync.result | 0 .../r/merge-big.result | 0 .../{mono_main => eloq_main}/r/merge.result | 0 .../r/merge_debug.result | 0 .../r/merge_innodb.result | 0 .../r/merge_mmap.result | 0 .../r/metadata.result | 0 .../r/mix2_myisam.result | 0 .../r/mix2_myisam_ucs2.result | 0 .../r/mrr_derived_crash_4610.result | 0 .../r/mrr_icp_extra.result | 0 .../r/multi_statement.result | 0 .../r/multi_update.result | 0 .../r/multi_update_big.result | 0 .../r/multi_update_binlog.result | 0 .../r/multi_update_debug.result | 0 .../r/multi_update_innodb.result | 0 .../r/multi_update_tiny_hash.result | 0 .../r/my_print_defaults.result | 0 .../r/myisam-big.result | 0 .../r/myisam-blob.result | 0 .../r/myisam-optimize.result | 0 .../r/myisam-system.result | 0 .../{mono_main => eloq_main}/r/myisam.result | 0 .../r/myisam_crash_before_flush_keys.result | 0 .../r/myisam_debug.result | 0 .../r/myisam_enable_keys-10506.result | 0 .../r/myisam_explain_non_select_all.result | 0 .../r/myisam_icp.result | 0 .../r/myisam_icp_debug.result | 0 .../r/myisam_icp_notembedded.result | 0 .../r/myisam_mrr,32bit.rdiff | 0 .../r/myisam_mrr.result | 0 .../r/myisam_optimize.result | 0 .../r/myisam_recover.result | 0 .../r/myisampack.result | 0 .../r/mysql-bug41486.result | 0 .../r/mysql-bug45236.result | 0 .../r/mysql-metadata.result | 0 .../{mono_main => eloq_main}/r/mysql.result | 0 .../r/mysql5613mysql.result | 0 .../r/mysql57_virtual.result | 0 .../r/mysql_binary_mode.result | 0 .../r/mysql_binary_zero_insert.result | 0 .../r/mysql_client_test.result | 0 .../r/mysql_client_test_comp.result | 0 .../r/mysql_client_test_nonblock.result | 0 .../r/mysql_comments.result | 0 .../r/mysql_cp932.result | 0 .../r/mysql_embedded.result | 0 .../r/mysql_install_db_win.result | 0 .../r/mysql_json_mysql_upgrade.result | 0 ...on_mysql_upgrade_with_plugin_loaded.result | 0 .../r/mysql_json_table_recreate.result | 0 .../r/mysql_locale_posix.result | 0 .../r/mysql_not_windows.result | 0 .../r/mysql_protocols.result | 0 .../r/mysql_tzinfo_to_sql_symlink.result | 0 .../r/mysql_upgrade-20228.result | 0 .../r/mysql_upgrade-6984.result | 0 .../r/mysql_upgrade.result | 0 .../mysql_upgrade_mysql_json_datatype.result | 0 .../r/mysql_upgrade_no_innodb.result | 0 .../r/mysql_upgrade_noengine.result | 0 .../r/mysql_upgrade_ssl.result | 0 .../r/mysql_upgrade_to_100502.result | 0 .../r/mysql_upgrade_view.result | 0 .../r/mysqladmin.result | 0 .../r/mysqlbinlog-innodb.result | 0 .../r/mysqlbinlog.result | 0 .../r/mysqlbinlog_raw_mode.result | 0 .../r/mysqlbinlog_row_big.result | 0 .../r/mysqlbinlog_row_compressed.result | 0 .../r/mysqlbinlog_row_minimal.result | 0 .../r/mysqlbinlog_stmt_compressed.result | 0 .../r/mysqlcheck.result | 0 .../r/mysqld--defaults-file.result | 0 .../r/mysqld--help,aix.rdiff | 0 .../r/mysqld--help,win.rdiff | 0 .../r/mysqld--help-aria.result | 0 .../r/mysqld--help.result | 0 .../r/mysqld_help_crash-9183.result | 0 .../r/mysqld_option_err.result | 0 .../r/mysqldump-compat-102.result | 0 .../r/mysqldump-compat.result | 0 .../r/mysqldump-max.result | 0 .../r/mysqldump-nl.result | 0 .../r/mysqldump-no-binlog.result | 0 .../r/mysqldump-system,win.rdiff | 0 .../r/mysqldump-system.result | 0 .../r/mysqldump-utf8mb4.result | 0 .../r/mysqldump.result | 0 .../r/mysqldump_restore.result | 0 .../r/mysqlhotcopy_myisam.result | 0 .../r/mysqlshow.result | 0 .../r/mysqlslap.result | 0 .../r/mysqltest.result | 0 .../r/mysqltest_256.result | 0 .../r/mysqltest_cont_on_error.result | 0 .../r/mysqltest_ps.result | 0 .../r/mysqltest_tracking_info.result | 0 .../r/named_pipe.result | 0 .../r/negation_elimination.result | 0 .../r/nested_profiling.result | 0 .../r/no-threads.result | 0 .../r/no_binlog.result | 0 .../r/non_blocking_api.result | 0 .../r/not_embedded_server.result | 0 .../r/not_partition.result | 0 .../{mono_main => eloq_main}/r/null.result | 0 .../r/null_key.result | 0 .../{mono_main => eloq_main}/r/odbc.result | 0 .../{mono_main => eloq_main}/r/olap.result | 0 .../r/old-mode.result | 0 .../r/openssl_1.result | 0 .../r/openssl_6975,tlsv10.result | 0 .../r/openssl_6975,tlsv12.result | 0 .../r/opt_trace,ps.rdiff | 0 .../r/opt_trace.result | 0 .../r/opt_trace_index_merge.result | 0 .../r/opt_trace_index_merge_innodb.result | 0 .../r/opt_trace_security.result | 0 .../r/opt_trace_ucs2.result | 0 .../{mono_main => eloq_main}/r/opt_tvc.result | 0 .../r/order_by-mdev-10122.result | 0 .../r/order_by.result | 0 .../r/order_by_innodb.result | 0 .../r/order_by_optimizer.result | 0 .../r/order_by_optimizer_innodb.result | 0 .../r/order_by_pack_big.result | 0 .../r/order_by_sortkey.result | 0 .../r/order_by_zerolength-4285.result | 0 .../r/order_fill_sortbuf.result | 0 .../{mono_main => eloq_main}/r/outfile.result | Bin .../r/outfile_loaddata.result | 0 .../r/overflow.result | 0 .../{mono_main => eloq_main}/r/packet.result | 0 .../{mono_main => eloq_main}/r/parser.result | 0 .../r/parser_bug21114_innodb.result | 0 .../r/parser_not_embedded.result | 0 .../r/parser_stack.result | 0 .../r/partition.result | 0 .../r/partition_alter.result | 0 .../r/partition_binlog.result | 0 .../r/partition_binlog_stmt.result | 0 .../r/partition_blackhole.result | 0 .../r/partition_bug18198.result | 0 .../r/partition_cache.result | 0 .../r/partition_cache_innodb.result | 0 .../r/partition_cache_myisam.result | 0 .../r/partition_charset.result | 0 .../r/partition_column.result | 0 .../r/partition_column_prune.result | 0 .../r/partition_csv.result | 0 .../r/partition_datatype.result | 0 .../r/partition_debug_sync.result | 0 .../r/partition_default.result | 0 .../r/partition_disabled.result | 0 .../r/partition_error.result | 0 .../r/partition_example.result | 0 .../r/partition_exchange.result | 0 .../r/partition_explicit_prune.result | 0 .../r/partition_grant.result | 0 .../r/partition_hash.result | 0 .../r/partition_innodb.result | 0 .../r/partition_innodb_plugin.result | 0 .../r/partition_innodb_semi_consistent.result | 0 .../r/partition_innodb_stmt.result | 0 .../r/partition_key_cache.result | 0 .../r/partition_list.result | 0 .../r/partition_mgm.result | 0 .../r/partition_mgm_err.result | 0 .../r/partition_mgm_err2.result | 0 .../r/partition_mrr_aria.result | 0 .../r/partition_mrr_innodb.result | 0 .../r/partition_mrr_myisam.result | 0 .../r/partition_myisam.result | 0 .../r/partition_not_blackhole.result | 0 .../r/partition_not_windows.result | 0 .../r/partition_open_files_limit.result | 0 .../r/partition_order.result | 0 .../r/partition_pruning.result | 0 .../r/partition_range.result | 0 .../r/partition_rename_longfilename.result | 0 .../r/partition_symlink.result | 0 .../r/partition_sync.result | 0 .../r/partition_truncate.result | 0 .../r/partition_ucs2.result | 0 .../r/partition_utf8-debug.result | 0 .../r/partition_utf8.result | 0 .../r/partition_windows.result | 0 .../r/password_expiration.result | 0 .../r/password_expiration_unix_socket.result | 0 .../percona_nonflushing_analyze_debug.result | 0 .../r/perror-win.result | 0 .../{mono_main => eloq_main}/r/perror.result | 0 .../{mono_main => eloq_main}/r/plugin.result | 0 .../r/plugin_auth.result | 0 .../r/plugin_auth_qa.result | 0 .../r/plugin_auth_qa_1.result | 0 .../r/plugin_auth_qa_2.result | 0 .../r/plugin_auth_qa_3.result | 0 .../r/plugin_innodb.result | 0 .../r/plugin_load.result | 0 .../r/plugin_load_option.result | 0 .../r/plugin_loaderr.result | 0 .../r/plugin_maturity.result | 0 .../r/plugin_not_embedded.result | 0 .../r/plugin_vars.result | 0 .../r/pool_of_threads.result | 0 .../r/precedence.result | 0 .../r/precedence_bugs.result | 0 .../{mono_main => eloq_main}/r/preload.result | 0 .../{mono_main => eloq_main}/r/prepare.result | 0 .../r/processlist.result | 0 .../r/processlist_notembedded.result | 0 .../r/profiling.result | 0 .../r/progress_976225.result | 0 .../{mono_main => eloq_main}/r/ps.result | 0 .../r/ps_10nestset.result | 0 .../r/ps_11bugs.result | 0 .../r/ps_1general.result | 0 .../r/ps_2myisam.result | 0 .../r/ps_3innodb.result | 0 .../r/ps_4heap.result | 0 .../r/ps_5merge.result | 0 .../r/ps_change_master.result | 0 .../{mono_main => eloq_main}/r/ps_ddl.result | 0 .../{mono_main => eloq_main}/r/ps_ddl1.result | 0 .../r/ps_error.result | 0 .../r/ps_grant.result | 0 .../r/ps_innodb.result | 0 .../r/ps_max_subselect-5113.result | 0 .../r/ps_missed_cmds.result | 0 .../r/ps_missed_cmds_bin_prot.result | 0 ...s_missed_cmds_bin_prot_not_embedded.result | 0 .../r/ps_missed_cmds_not_embedded.result | 0 .../r/ps_not_windows.result | 0 .../r/ps_qc_innodb.result | 0 .../r/ps_show_log.result | 0 .../r/query_cache.result | 0 .../r/query_cache_28249.result | 0 .../r/query_cache_debug.result | 0 .../r/query_cache_innodb.result | 0 .../r/query_cache_merge.result | 0 .../r/query_cache_notembedded.result | 0 .../r/query_cache_ps_no_prot.result | 0 .../r/query_cache_ps_ps_prot.result | 0 .../r/query_cache_with_views.result | 0 .../r/quick_select_4161.result | 0 .../{mono_main => eloq_main}/r/range.result | 0 .../r/range_debug.result | 0 .../r/range_innodb.result | 0 .../r/range_interrupted-13751.result | 0 .../r/range_mrr_icp.result | 0 .../r/range_notembedded.result | 0 .../r/range_vs_index_merge.result | 0 .../r/range_vs_index_merge_innodb.result | 0 .../r/read_many_rows_innodb.result | 0 .../r/read_only.result | 0 .../r/read_only_innodb.result | 0 .../{mono_main => eloq_main}/r/rename.result | 0 .../r/renamedb.result | 0 .../r/reopen_temp_table.result | 0 .../{mono_main => eloq_main}/r/repair.result | 0 .../r/repair_symlink-5543.result | 0 .../{mono_main => eloq_main}/r/replace.result | 0 .../r/replace_returning.result | 0 .../r/replace_returning_datatypes.result | 0 .../r/replace_returning_err.result | 0 .../r/require_secure_transport.result | 0 .../r/reset_connection.result | 0 .../r/rollback.result | 0 .../{mono_main => eloq_main}/r/round.result | 0 .../r/row-checksum-old.result | 0 .../r/row-checksum.result | 0 .../{mono_main => eloq_main}/r/row.result | 0 .../r/rowid_filter.result | 0 .../r/rowid_filter_innodb.result | 0 .../r/rowid_filter_innodb_debug.result | 0 .../r/rowid_filter_myisam.result | 0 .../r/rowid_filter_myisam_debug.result | 0 .../r/rowid_order_innodb.result | 0 .../{mono_main => eloq_main}/r/rownum.result | 0 .../rpl_mysql_upgrade_slave_repo_check.result | 0 .../r/rpl_mysqldump_slave.result | 0 .../{mono_main => eloq_main}/r/schema.result | 0 .../r/second_frac-9175.result | 0 .../r/secure_file_priv_win.result | 0 .../{mono_main => eloq_main}/r/select.result | 0 .../r/select_debug.result | 0 .../r/select_found.result | 0 .../r/select_jcl6.result | 0 .../r/select_pkeycache.result | 0 .../r/select_safe.result | 0 .../r/selectivity.result | 0 .../r/selectivity_innodb.result | 0 .../r/selectivity_no_engine.result | 0 .../{mono_main => eloq_main}/r/servers.result | 0 .../r/session_tracker_last_gtid.result | 0 .../r/set_operation.result | 0 .../r/set_operation_oracle.result | 0 .../r/set_password.result | 0 .../r/set_statement.result | 0 .../r/set_statement_debug.result | 0 .../r/set_statement_notembedded.result | 0 .../r/set_statement_notembedded_binlog.result | 0 .../r/set_statement_profiling.result | 0 .../{mono_main => eloq_main}/r/show.result | 0 .../r/show_bad_definer-5553.result | 0 .../r/show_check.result | 0 .../r/show_create_user.result | 0 .../r/show_explain.result | 0 .../r/show_explain_non_select.result | 0 .../r/show_explain_ps.result | 0 ...nction_with_pad_char_to_full_length.result | 0 .../r/show_profile.result | 0 .../r/show_row_order-9226.result | 0 .../r/shutdown.result | 0 .../r/shutdown_not_windows.result | 0 .../r/sighup-6580.result | 0 .../{mono_main => eloq_main}/r/signal.result | 0 .../r/signal_code.result | 0 .../r/signal_demo1.result | 0 .../r/signal_demo2.result | 0 .../r/signal_demo3.result | 0 .../r/signal_sqlmode.result | 0 .../r/simultaneous_assignment.result | 0 .../r/single_delete_update.result | 0 .../r/single_delete_update_innodb.result | 0 .../r/skip_grants.result | 0 .../r/skip_log_bin.result | 0 .../r/skip_name_resolve.result | 0 .../r/slowlog_enospace-10508.result | 0 .../r/sp-anchor-row-type-cursor.result | 0 .../r/sp-anchor-row-type-table.result | 0 .../r/sp-anchor-type.result | 0 .../{mono_main => eloq_main}/r/sp-big.result | 0 .../{mono_main => eloq_main}/r/sp-bugs.result | 0 .../r/sp-bugs2.result | 0 .../{mono_main => eloq_main}/r/sp-code.result | 0 .../r/sp-condition-handler.result | 0 .../r/sp-cursor.result | 0 .../r/sp-destruct.result | 0 .../r/sp-dynamic.result | 0 .../r/sp-error.result | 0 .../{mono_main => eloq_main}/r/sp-expr.result | 0 .../{mono_main => eloq_main}/r/sp-fib.result | 0 .../r/sp-for-loop.result | 0 .../r/sp-group.result | 0 .../r/sp-innodb.result | 0 .../{mono_main => eloq_main}/r/sp-lock.result | 0 .../r/sp-no-code.result | 0 .../r/sp-no-valgrind.result | 0 .../r/sp-prelocking.result | 0 .../{mono_main => eloq_main}/r/sp-row.result | 0 .../r/sp-security-anchor-type.result | 0 .../r/sp-security.result | 0 .../r/sp-threads.result | 0 .../{mono_main => eloq_main}/r/sp-ucs2.result | 0 .../{mono_main => eloq_main}/r/sp-vars.result | 0 .../{mono_main => eloq_main}/r/sp.result | 0 .../{mono_main => eloq_main}/r/sp2.result | 0 .../{mono_main => eloq_main}/r/sp_gis.result | 0 .../r/sp_missing_4665.result | 0 .../r/sp_notembedded.result | 0 .../r/sp_stress_case.result | 0 .../{mono_main => eloq_main}/r/sp_sync.result | 0 .../r/sp_trans.result | 0 .../r/sp_trans_log.result | 0 .../r/sql_mode.result | 0 .../r/sql_safe_updates.result | 0 .../{mono_main => eloq_main}/r/ssl-big.result | 0 .../{mono_main => eloq_main}/r/ssl.result | 0 .../r/ssl_7937,nossl.result | 0 .../r/ssl_7937.result | 0 .../r/ssl_8k_key.result | 0 .../r/ssl_and_innodb.result | 0 .../{mono_main => eloq_main}/r/ssl_ca.result | 0 .../r/ssl_cipher.result | 0 .../r/ssl_compress.result | 0 .../r/ssl_connect.result | 0 .../{mono_main => eloq_main}/r/ssl_crl.result | 0 .../r/ssl_crl_clients.result | 0 .../r/ssl_system_ca,bad.result | 0 .../r/ssl_system_ca.result | 0 .../r/ssl_timeout-9836.result | 0 .../r/ssl_timeout.result | 0 .../r/ssl_verify_ip.result | 0 .../r/stack-crash.result | 0 .../r/stat_tables-enospc.result | 0 .../r/stat_tables.result | 0 .../r/stat_tables_disabled.result | 0 .../r/stat_tables_innodb.result | 0 .../r/stat_tables_innodb_debug.result | 0 .../r/stat_tables_missing.result | 0 .../r/stat_tables_myisam_debug.result | 0 .../r/stat_tables_par.result | 0 .../r/stat_tables_par_innodb.result | 0 .../r/stat_tables_partition.result | 0 .../r/stat_tables_rbr.result | 0 .../r/stat_tables_repl.result | 0 .../r/statement-expr.result | 0 .../r/statistics.result | 0 .../r/statistics_close.result | 0 .../r/statistics_index_crash-7362.result | 0 .../{mono_main => eloq_main}/r/status.result | 0 .../{mono_main => eloq_main}/r/status2.result | 0 .../r/status_bug17954.result | 0 .../r/str_to_datetime_457.result | 0 .../{mono_main => eloq_main}/r/strict.result | 0 .../r/strict_autoinc_1myisam.result | 0 .../r/strict_autoinc_2innodb.result | 0 .../r/strict_autoinc_3heap.result | 0 .../{mono_main => eloq_main}/r/strings.result | 0 .../r/subselect-crash_15755.result | 0 .../r/subselect.result | 0 .../r/subselect2.result | 0 .../r/subselect3.result | 0 .../r/subselect3_jcl6.result | 0 .../r/subselect4.result | 0 .../r/subselect_cache.result | 0 .../r/subselect_debug.result | 0 .../r/subselect_exists2in.result | 0 .../r/subselect_exists2in_costmat.result | 0 .../r/subselect_extra.result | 0 .../r/subselect_extra_no_semijoin.result | 0 .../r/subselect_gis.result | 0 .../r/subselect_innodb.result | 0 .../r/subselect_mat.result | 0 .../r/subselect_mat_cost.result | 0 .../r/subselect_mat_cost_bugs.result | 0 .../r/subselect_no_exists_to_in.result | 0 .../r/subselect_no_mat.result | 0 .../r/subselect_no_opts.result | 0 .../r/subselect_no_scache.result | 0 .../r/subselect_no_semijoin.result | 0 .../r/subselect_notembedded.result | 0 .../r/subselect_nulls.result | 0 .../r/subselect_partial_match.result | 0 .../r/subselect_sj.result | 0 .../r/subselect_sj2.result | 0 .../r/subselect_sj2_jcl6.result | 0 .../r/subselect_sj2_mat.result | 0 .../r/subselect_sj_aria.result | 0 .../r/subselect_sj_jcl6.result | 0 .../r/subselect_sj_mat.result | 0 .../r/subselect_sj_nonmerged.result | 0 .../r/sum_distinct-big.result | 0 .../r/sum_distinct.result | 0 .../r/symlink-aria-11902.result | 0 .../r/symlink-myisam-11902.result | 0 .../{mono_main => eloq_main}/r/symlink.result | 0 .../r/synchronization.result | 0 .../r/sysdate_is_now.result | 0 .../r/system_mysql_db.result | 0 .../r/system_mysql_db_507.result | 0 .../r/system_mysql_db_error_log.result | 0 .../r/system_mysql_db_fix40123.result | 0 .../r/system_mysql_db_fix50030.result | 0 .../r/system_mysql_db_fix50117.result | 0 .../r/system_mysql_db_refs.result | 0 .../r/system_time_debug.result | 0 .../r/table_elim.result | 0 .../r/table_elim_debug.result | 0 .../r/table_keyinfo-6838.result | 0 .../r/table_options-5867.result | 0 .../r/table_options.result | 0 .../r/table_value_constr.result | 0 .../r/tablelock.result | 0 .../r/tablespace.result | 0 .../r/tc_heuristic_recover.result | 0 .../r/temp_table.result | 0 .../r/temp_table_frm.result | 0 .../r/temp_table_symlink.result | 0 .../r/temporal_literal.result | 0 .../r/temporal_scale_4283.result | 0 .../r/thread_id_overflow.result | 0 .../r/thread_pool_info.result | 0 .../{mono_main => eloq_main}/r/timeout.result | 0 .../r/timezone.result | 0 .../r/timezone2.result | 0 .../r/timezone3.result | 0 .../r/timezone4.result | 0 .../r/timezone_grant.result | 0 .../r/tls_version.result | 0 .../r/tls_version1.result | 0 .../r/tmp_table_count-7586.result | 0 .../r/trans_read_only.result | 0 .../r/transaction_timeout.result | 0 .../r/trigger-compat.result | 0 .../r/trigger-trans.result | 0 .../{mono_main => eloq_main}/r/trigger.result | 0 .../r/trigger_no_defaults-11698.result | 0 .../r/trigger_notembedded.result | 0 .../r/trigger_null-8605.result | 0 .../r/trigger_wl3253.result | 0 .../r/truncate-stale-6500.result | 0 .../r/truncate.result | 0 .../r/truncate_badse.result | 0 .../r/truncate_coverage.result | 0 .../r/truncate_notembedded.result | 0 .../r/type_binary.result | 0 .../r/type_bit.result | 0 .../r/type_bit_innodb.result | 0 .../r/type_blob.result | 0 .../r/type_date.result | 0 .../r/type_date_round.result | 0 .../r/type_datetime.result | 0 .../r/type_datetime_hires.result | 0 .../r/type_datetime_round.result | 0 .../r/type_decimal.result | 0 .../r/type_enum.result | 0 .../r/type_float.result | 0 .../r/type_hex_hybrid.result | 0 .../r/type_int.result | 0 .../r/type_interval.result | 0 .../r/type_json.result | 0 .../r/type_nchar.result | 0 .../r/type_newdecimal-big.result | 0 .../r/type_newdecimal.result | 0 .../r/type_num.result | 0 .../r/type_num_innodb.result | 0 .../r/type_ranges.result | 0 .../r/type_row.result | 0 .../r/type_set.result | 0 .../r/type_temporal_innodb.result | 0 .../r/type_temporal_mariadb53.result | 0 .../r/type_temporal_mysql56.result | 0 .../r/type_temporal_mysql56_debug.result | 0 .../r/type_time.result | 0 .../r/type_time_6065.result | 0 .../r/type_time_hires.result | 0 .../r/type_time_round.result | 0 .../r/type_timestamp.result | 0 .../r/type_timestamp_hires.result | 0 .../r/type_timestamp_round.result | 0 .../r/type_uint.result | 0 .../r/type_varchar.result | 0 .../r/type_varchar_mysql41.result | 0 .../r/type_year.result | 0 .../{mono_main => eloq_main}/r/udf.result | 0 .../r/udf_debug_sync.result | 0 .../r/udf_notembedded.result | 0 .../r/udf_query_cache.result | 0 .../r/udf_skip_grants.result | 0 .../{mono_main => eloq_main}/r/union.result | 0 .../r/union_crash-714.result | 0 .../{mono_main => eloq_main}/r/unique.result | 0 .../r/unsafe_binlog_innodb.result | 0 .../{mono_main => eloq_main}/r/update.result | 0 .../r/update_ignore_216.result | 0 .../r/update_innodb.result | 0 .../r/update_use_source.result | 0 .../{mono_main => eloq_main}/r/upgrade.result | 0 .../r/upgrade_MDEV-19650.result | 0 .../r/upgrade_MDEV-23102-1.result | 0 .../r/upgrade_MDEV-23102-2.result | 0 .../r/upgrade_mdev_24363.result | 0 .../r/user_limits.result | 0 .../r/user_var-binlog.result | 0 .../r/user_var.result | 0 .../r/userstat-badlogin-4824.result | 0 .../r/userstat.result | 0 .../r/varbinary.result | 0 .../r/variables-notembedded.result | 0 .../r/variables.result | 0 .../r/variables_community.result | 0 .../{mono_main => eloq_main}/r/view.result | 0 .../r/view_alias.result | 0 .../r/view_debug.result | 0 .../r/view_grant.result | 0 .../r/wait_timeout.result | 0 .../r/warnings.result | 0 .../r/warnings_debug.result | 0 .../r/warnings_engine_disabled.result | 0 .../{mono_main => eloq_main}/r/win.result | 0 .../r/win_as_arg_to_aggregate_func.result | 0 .../{mono_main => eloq_main}/r/win_avg.result | 0 .../r/win_big-mdev-10092.result | 0 .../r/win_big-mdev-11697.result | 0 .../{mono_main => eloq_main}/r/win_big.result | 0 .../{mono_main => eloq_main}/r/win_bit.result | 0 .../r/win_empty_over.result | 0 .../r/win_first_last_value.result | 0 .../{mono_main => eloq_main}/r/win_i_s.result | 0 .../r/win_insert_select.result | 0 .../r/win_lead_lag.result | 0 .../r/win_min_max.result | 0 .../r/win_nth_value.result | 0 .../r/win_ntile.result | 0 .../r/win_orderby.result | 0 .../r/win_percent_cume.result | 0 .../r/win_percentile.result | 0 .../r/win_rank.result | 0 .../{mono_main => eloq_main}/r/win_std.result | 0 .../{mono_main => eloq_main}/r/win_sum.result | 0 .../{mono_main => eloq_main}/r/windows.result | 0 .../r/windows_debug.result | 0 .../{mono_main => eloq_main}/r/wolfssl.result | 0 .../{mono_main => eloq_main}/r/xa.result | 0 .../r/xa_binlog.result | 0 .../r/xa_prepared_binlog_off.result | 0 .../{mono_main => eloq_main}/r/xa_sync.result | 0 .../{mono_main => eloq_main}/r/xml.result | 0 .../r/xtradb_mrr.result | 0 .../{mono_main => eloq_main}/t/1st.test | 0 .../t/aborted_clients.test | 0 .../t/adddate_454.test | 0 .../{mono_main => eloq_main}/t/alias.test | 0 .../t/almost_full.test | 0 .../t/alter_events.test | 0 .../t/alter_table-big.test | 0 .../t/alter_table.combinations | 0 .../t/alter_table.test | 0 .../t/alter_table_autoinc-5574.test | 0 .../t/alter_table_debug.test | 0 .../t/alter_table_errors.test | 0 .../t/alter_table_mdev539_maria.test | 0 .../t/alter_table_mdev539_myisam.test | 0 .../t/alter_table_online.test | 0 .../t/alter_table_trans.test | 0 .../t/alter_user.test | 0 .../{mono_main => eloq_main}/t/analyze.test | 0 .../t/analyze_debug.test | 0 .../t/analyze_format_json.test | 0 .../t/analyze_stmt.test | 0 .../t/analyze_stmt_orderby.test | 0 .../t/analyze_stmt_privileges.test | 0 .../t/analyze_stmt_privileges2.test | 0 .../t/analyze_stmt_slow_query_log-master.opt | 0 .../t/analyze_stmt_slow_query_log.test | 0 .../{mono_main => eloq_main}/t/ansi.test | 0 .../t/aria_icp_debug.test | 0 .../t/assign_key_cache.test | 0 .../t/assign_key_cache_debug.test | 0 .../t/auth_named_pipe-master.opt | 0 .../t/auth_named_pipe.test | 0 .../t/auth_rpl-slave.opt | 0 .../{mono_main => eloq_main}/t/auth_rpl.test | 0 .../t/auto_increment.test | 0 .../t/auto_increment_ranges.inc | 0 .../t/auto_increment_ranges_innodb.test | 0 .../t/auto_increment_ranges_myisam.test | 0 .../t/backup_aria.test | 0 .../t/backup_interaction.test | 0 .../t/backup_lock.test | 0 .../t/backup_lock_binlog.test | 0 .../t/backup_lock_debug.test | 0 .../t/backup_locks.test | 0 .../{mono_main => eloq_main}/t/backup_log.inc | 0 .../t/backup_log.test | 0 .../t/backup_priv.test | 0 .../t/backup_stages.test | 0 .../t/backup_syntax.test | 0 .../t/bad_frm_crash_5029.test | 0 .../t/bench_count_distinct.test | 0 .../{mono_main => eloq_main}/t/bigint.test | 0 .../{mono_main => eloq_main}/t/binary.test | 0 .../t/binary_to_hex.test | 0 .../t/bind_address_resolution.opt | 0 .../t/bind_address_resolution.test | 0 .../{mono_main => eloq_main}/t/blackhole.test | 0 .../t/blackhole_plugin.test | 0 .../{mono_main => eloq_main}/t/bool.test | 0 .../t/bootstrap-master.opt | 0 .../{mono_main => eloq_main}/t/bootstrap.test | 0 .../t/bootstrap_innodb.test | 0 .../{mono_main => eloq_main}/t/brackets.test | 0 .../t/bug12427262.test | 0 .../t/bug13633383.test | 0 .../{mono_main => eloq_main}/t/bug39022.opt | 0 .../{mono_main => eloq_main}/t/bug39022.test | 0 .../t/bug46760-master.opt | 0 .../{mono_main => eloq_main}/t/bug46760.test | 0 .../t/bug47671-master.opt | 0 .../{mono_main => eloq_main}/t/bug47671.test | 0 .../t/bug58669-master.opt | 0 .../{mono_main => eloq_main}/t/bug58669.test | 0 .../t/bulk_replace.test | 0 .../t/cache_innodb.test | 0 .../t/cache_temporal_4265.test | 0 .../{mono_main => eloq_main}/t/case.test | 0 .../{mono_main => eloq_main}/t/cast.test | 0 .../t/change_user.test | 0 .../t/change_user_notembedded.test | 0 .../t/charset_client_win.test | 0 .../{mono_main => eloq_main}/t/check.test | 0 .../t/check_constraint.test | 0 .../t/check_constraint_innodb.test | 0 .../t/check_constraint_show.test | 0 .../t/cli_options_force_protocol_not_win.test | 0 .../t/cli_options_force_protocol_win.opt | 0 .../t/cli_options_force_protocol_win.test | 0 .../t/client_xml.test | 0 .../t/column_compression.inc | 0 .../t/column_compression.test | 0 .../t/column_compression_parts.test | 0 .../t/column_compression_rpl.opt | 0 .../t/column_compression_rpl.test | 0 .../t/column_compression_utf16.test | 0 .../t/comment_column.test | 0 .../t/comment_column2.test | 0 .../t/comment_database.test | 0 .../t/comment_index.test | 0 .../t/comment_table.test | 0 .../{mono_main => eloq_main}/t/comments.test | 0 .../{mono_main => eloq_main}/t/commit.opt | 0 .../{mono_main => eloq_main}/t/commit.test | 0 .../t/commit_1innodb.test | 0 .../{mono_main => eloq_main}/t/compare.test | 0 .../{mono_main => eloq_main}/t/compound.test | 0 .../{mono_main => eloq_main}/t/compress.test | 0 .../t/concurrent_innodb_safelog.test | 0 .../t/concurrent_innodb_unsafelog.test | 0 .../t/connect-abstract.cnf | 0 .../t/connect-abstract.test | 0 .../{mono_main => eloq_main}/t/connect.cnf | 0 .../{mono_main => eloq_main}/t/connect.test | 0 .../{mono_main => eloq_main}/t/connect2.cnf | 0 .../{mono_main => eloq_main}/t/connect2.test | 0 .../t/connect_debug.test | 0 .../t/consistent_snapshot.opt | 0 .../t/consistent_snapshot.test | 0 .../t/constraints.test | 0 .../t/contributors.test | 0 .../t/count_distinct.test | 0 .../t/count_distinct2-master.opt | 0 .../t/count_distinct2.test | 0 .../t/count_distinct3.test | 0 .../t/crash_commit_before-master.opt | 0 .../t/crash_commit_before.test | 0 .../t/create-big.test | 0 .../t/create-uca.test | 0 .../{mono_main => eloq_main}/t/create.test | 0 .../t/create_delayed.test | 0 .../t/create_drop_binlog.test | 0 .../t/create_drop_db.test | 0 .../t/create_drop_event.test | 0 .../t/create_drop_function.test | 0 .../t/create_drop_index.test | 0 .../t/create_drop_procedure.test | 0 .../t/create_drop_role.test | 0 .../t/create_drop_server.test | 0 .../t/create_drop_trigger.test | 0 .../t/create_drop_udf.test | 0 .../t/create_drop_user.test | 0 .../t/create_drop_view.test | 0 .../t/create_not_windows.test | 0 .../t/create_or_replace-master.opt | 0 .../t/create_or_replace.test | 0 .../t/create_or_replace2.test | 0 .../t/create_or_replace_permission.test | 0 .../t/create_replace_tmp.test | 0 .../t/create_select_tmp.test | 0 .../t/create_user.test | 0 .../t/create_utf8.test | 0 .../t/create_w_max_indexes_128.test | 0 .../t/create_w_max_indexes_64.test | 0 .../{mono_main => eloq_main}/t/cte_cycle.test | 0 .../{mono_main => eloq_main}/t/cte_grant.test | 0 .../t/cte_nonrecursive.test | 0 .../t/cte_nonrecursive_not_embedded.test | 0 .../t/cte_recursive.test | 0 .../t/cte_recursive_not_embedded.test | 0 .../t/ctype_ascii.test | 0 .../t/ctype_big5.test | 0 .../t/ctype_binary.test | 0 .../t/ctype_collate.test | 0 .../t/ctype_cp1250_ch.test | 0 .../t/ctype_cp1251.test | 0 .../t/ctype_cp850.test | 0 .../t/ctype_cp932.test | 0 .../t/ctype_cp932_binlog_row.test | 0 .../t/ctype_cp932_binlog_stm.test | 0 .../t/ctype_create.test | 0 .../t/ctype_dec8.test | 0 .../t/ctype_errors.test | 0 .../t/ctype_eucjpms.test | 0 .../t/ctype_euckr.test | 0 .../t/ctype_filename.test | 0 .../t/ctype_filesystem-master.opt | 0 .../t/ctype_filesystem.test | 0 .../t/ctype_gb2312.test | 0 .../{mono_main => eloq_main}/t/ctype_gbk.test | 0 .../t/ctype_gbk_binlog.test | 0 .../t/ctype_gbk_export_import.test | 0 .../t/ctype_hebrew.test | 0 .../t/ctype_latin1.test | 0 .../t/ctype_latin1_de.test | 0 .../t/ctype_latin2.test | 0 .../t/ctype_latin2_ch.test | 0 .../t/ctype_ldml-master.opt | 0 .../t/ctype_ldml.test | 0 .../t/ctype_like_range.test | 0 .../t/ctype_many.test | 0 .../{mono_main => eloq_main}/t/ctype_mb.test | 0 .../t/ctype_nopad_8bit.test | 0 .../t/ctype_partitions.test | 0 .../t/ctype_recoding.test | 0 .../t/ctype_sjis.test | 0 .../t/ctype_swe7.test | 0 .../t/ctype_tis620.test | 0 .../{mono_main => eloq_main}/t/ctype_uca.test | 0 .../t/ctype_uca_innodb.test | 0 .../t/ctype_uca_partitions.test | 0 .../{mono_main => eloq_main}/t/ctype_ucs.test | 0 .../t/ctype_ucs2_def-master.opt | 0 .../t/ctype_ucs2_def.test | 0 .../t/ctype_ucs2_query_cache-master.opt | 0 .../t/ctype_ucs2_query_cache.test | 0 .../t/ctype_ucs2_uca.test | 0 .../t/ctype_ujis.test | 0 .../t/ctype_ujis_ucs2.test | 0 .../t/ctype_upgrade.test | 0 .../t/ctype_utf16.test | 0 .../t/ctype_utf16_def-master.opt | 0 .../t/ctype_utf16_def.test | 0 .../t/ctype_utf16_uca.test | 0 .../t/ctype_utf16le.test | 0 .../t/ctype_utf32.test | 0 .../t/ctype_utf32_def.opt | 0 .../t/ctype_utf32_def.test | 0 .../t/ctype_utf32_uca.test | 0 .../t/ctype_utf8-master.opt | 0 .../t/ctype_utf8.test | 0 .../t/ctype_utf8_def_upgrade.opt | 0 .../t/ctype_utf8_def_upgrade.test | 0 .../t/ctype_utf8_uca.test | 0 .../t/ctype_utf8mb4-master.opt | 0 .../t/ctype_utf8mb4.test | 0 .../t/ctype_utf8mb4_heap.test | 0 .../t/ctype_utf8mb4_innodb-master.opt | 0 .../t/ctype_utf8mb4_innodb.test | 0 .../t/ctype_utf8mb4_myisam.test | 0 .../t/ctype_utf8mb4_uca.test | 0 .../t/custom_aggregate_functions.test | 0 .../t/custom_aggregates_i_s.test | 0 .../t/date_formats-master.opt | 0 .../t/date_formats.test | 0 .../t/datetime_456.test | 0 .../t/ddl_i18n_koi8r.test | 0 .../t/ddl_i18n_utf8.test | 0 .../t/deadlock_ftwrl.test | 0 .../t/deadlock_innodb.test | 0 .../t/debug_sync.test | 0 .../{mono_main => eloq_main}/t/default.test | 0 .../t/default_debug.test | 0 .../t/default_session.test | 0 .../t/default_storage_engine.test | 0 .../{mono_main => eloq_main}/t/delayed.test | 0 .../t/delayed_blob.opt | 0 .../t/delayed_blob.test | 0 .../{mono_main => eloq_main}/t/delete.test | 0 .../t/delete_innodb.test | 0 .../t/delete_returning.test | 0 .../t/delete_returning_grant.test | 0 .../t/delete_use_source.test | 0 .../t/delimiter_case_mdev_10728.sql | 0 .../t/delimiter_command_case_sensitivity.test | 0 .../t/deprecated_features.test | 0 .../{mono_main => eloq_main}/t/derived.test | 0 .../t/derived_cond_pushdown.test | 0 .../t/derived_opt.test | 0 .../t/derived_split_innodb.test | 0 .../t/derived_view.test | 0 .../t/dirty_close.test | 0 .../{mono_main => eloq_main}/t/distinct.test | 0 .../{mono_main => eloq_main}/t/drop.test | 0 .../t/drop_bad_db_type.test | 0 .../t/drop_combinations.inc | 0 .../t/drop_combinations.test | 0 .../t/drop_table_force.test | 0 .../{mono_main => eloq_main}/t/dyncol.test | 0 .../t/empty_server_name-8224.test | 0 .../t/empty_string_literal.test | 0 .../t/empty_table.test | 0 .../t/empty_user_table.test | 0 .../{mono_main => eloq_main}/t/endspace.test | 0 .../t/enforce_storage_engine.test | 0 .../t/enforce_storage_engine_opt.opt | 0 .../t/enforce_storage_engine_opt.test | 0 .../t/engine_error_in_alter-8453.test | 0 .../t/error_simulation-master.opt | 0 .../t/error_simulation.test | 0 .../{mono_main => eloq_main}/t/errors.test | 0 .../{mono_main => eloq_main}/t/events_1.test | 0 .../{mono_main => eloq_main}/t/events_2.test | 0 .../t/events_bugs-master.opt | 0 .../t/events_bugs.test | 0 .../t/events_embedded.test | 0 .../t/events_grant.test | 0 .../t/events_logs_tests-master.opt | 0 .../t/events_logs_tests.test | 0 .../t/events_microsec.test | 0 .../t/events_restart-master.opt | 0 .../t/events_restart.test | 0 .../t/events_scheduling.test | 0 .../t/events_slowlog.test | 0 .../t/events_stress.test | 0 .../t/events_time_zone.test | 0 .../t/events_trans.test | 0 .../t/events_trans_notembedded.test | 0 .../{mono_main => eloq_main}/t/except.test | 0 .../t/except_all.test | 0 .../t/execution_constants.test | 0 .../{mono_main => eloq_main}/t/explain.test | 0 .../t/explain_json.test | 0 .../t/explain_json_format_partitions.test | 0 .../t/explain_json_innodb.test | 0 .../t/explain_non_select.test | 0 .../t/explain_slowquerylog-master.opt | 0 .../t/explain_slowquerylog.test | 0 .../t/ext_key_noPK_6794.test | 0 .../t/failed_auth_3909.test | 0 .../t/failed_auth_unixsocket.test | 0 .../t/fast_prefix_index_fetch_innodb.test | 0 .../{mono_main => eloq_main}/t/features.test | 0 .../t/fetch_first.test | 0 .../t/file_contents.test | 0 .../t/filesort_bad_i_s-7585.test | 0 .../t/filesort_debug.test | 0 .../t/fix_priv_tables.test | 0 .../t/flush-innodb-notembedded.test | 0 .../t/flush-innodb.test | 0 .../{mono_main => eloq_main}/t/flush.test | 0 .../t/flush2-master.opt | 0 .../{mono_main => eloq_main}/t/flush2.test | 0 .../t/flush_and_binlog.test | 0 .../t/flush_block_commit.test | 0 .../t/flush_block_commit_notembedded.test | 0 .../t/flush_logs_not_windows.test | 0 .../t/flush_notembedded.test | 0 .../t/flush_read_lock.test | 0 .../t/flush_read_lock_kill.test | 0 .../{mono_main => eloq_main}/t/flush_ssl.test | 0 .../t/flush_table.test | 0 .../t/foreign_key.test | 0 .../{mono_main => eloq_main}/t/frm-debug.test | 0 .../t/frm_bad_row_type-7333.test | 0 .../{mono_main => eloq_main}/t/fulltext.test | 0 .../{mono_main => eloq_main}/t/fulltext2.test | 0 .../{mono_main => eloq_main}/t/fulltext3.test | 0 .../t/fulltext_cache.test | 0 .../t/fulltext_charsets.test | 0 .../t/fulltext_derived_4257.test | 0 .../t/fulltext_derived_4316.test | 0 .../t/fulltext_distinct.test | 0 .../t/fulltext_left_join.test | 0 .../t/fulltext_multi.test | 0 .../t/fulltext_order_by.test | 0 .../t/fulltext_update.test | 0 .../t/fulltext_var.test | 0 .../t/func_analyse.test | 0 .../{mono_main => eloq_main}/t/func_bit.test | 0 .../t/func_compress.test | 0 .../t/func_concat.test | 0 .../t/func_crypt.test | 0 .../t/func_date_add.test | 0 .../t/func_debug.test | 0 .../t/func_default.test | 0 .../t/func_des_encrypt.test | 0 .../t/func_digest.test | 0 .../t/func_encrypt-master.opt | 0 .../t/func_encrypt.test | 0 .../t/func_encrypt_nossl.test | 0 .../t/func_encrypt_ucs2.test | 0 .../t/func_equal.test | 0 .../t/func_extract.test | 0 .../t/func_gconcat.test | 0 .../t/func_group.test | 0 .../t/func_group_innodb.test | 0 .../t/func_hybrid_type.test | 0 .../{mono_main => eloq_main}/t/func_if.test | 0 .../{mono_main => eloq_main}/t/func_in.test | 0 .../{mono_main => eloq_main}/t/func_int.test | 0 .../t/func_isnull.test | 0 .../{mono_main => eloq_main}/t/func_json.test | 0 .../{mono_main => eloq_main}/t/func_like.test | 0 .../{mono_main => eloq_main}/t/func_math.test | 0 .../{mono_main => eloq_main}/t/func_misc.test | 0 .../{mono_main => eloq_main}/t/func_op.test | 0 .../t/func_regexp.test | 0 .../t/func_regexp_pcre.test | 0 .../t/func_regexp_pcre_debug.test | 0 .../t/func_rollback.test | 0 .../t/func_sapdb.test | 0 .../{mono_main => eloq_main}/t/func_set.test | 0 .../{mono_main => eloq_main}/t/func_str.test | 0 .../t/func_system.test | 0 .../{mono_main => eloq_main}/t/func_test.test | 0 .../{mono_main => eloq_main}/t/func_time.test | 0 .../t/func_time_hires.test | 0 .../t/func_time_round.test | 0 .../t/func_timestamp.test | 0 .../t/func_weight_string.test | 0 .../t/function_defaults.test | 0 .../t/function_defaults_innodb.test | 0 .../t/function_defaults_notembedded.test | 0 .../{mono_main => eloq_main}/t/gcc296.test | 0 .../t/get_diagnostics.test | 0 .../t/gis-alter_table_online.test | 0 .../{mono_main => eloq_main}/t/gis-debug.test | 0 .../{mono_main => eloq_main}/t/gis-json.test | 0 .../t/gis-loaddata.test | 0 .../t/gis-precise.test | 0 .../t/gis-rt-precise.test | 0 .../{mono_main => eloq_main}/t/gis-rtree.test | 0 .../{mono_main => eloq_main}/t/gis.test | 0 .../t/gis_notembedded.test | 0 .../{mono_main => eloq_main}/t/grant.opt | 0 .../{mono_main => eloq_main}/t/grant.test | 0 .../{mono_main => eloq_main}/t/grant2.opt | 0 .../{mono_main => eloq_main}/t/grant2.test | 0 .../t/grant3-master.opt | 0 .../{mono_main => eloq_main}/t/grant3.test | 0 .../{mono_main => eloq_main}/t/grant4.opt | 0 .../{mono_main => eloq_main}/t/grant4.test | 0 .../{mono_main => eloq_main}/t/grant5.test | 0 .../t/grant_4332.test | 0 .../t/grant_binlog_replay.test | 0 .../t/grant_cache_no_prot.test | 0 .../t/grant_cache_ps_prot.test | 0 .../t/grant_explain_non_select.test | 0 .../t/grant_kill.test | 0 .../t/grant_lowercase.opt | 0 .../t/grant_lowercase.test | 0 .../t/grant_lowercase_fs.test | 0 .../t/grant_master_admin.test | 0 .../t/grant_not_windows.test | 0 .../t/grant_read_only.test | 0 .../t/grant_repair.test | 0 .../t/grant_server.test | 0 .../t/grant_slave_admin.test | 0 .../t/grant_slave_monitor.test | 0 .../t/greedy_optimizer.test | 0 .../{mono_main => eloq_main}/t/group_by.test | 0 .../t/group_by_innodb.test | 0 .../t/group_by_null.test | 0 .../t/group_min_max.test | 0 .../t/group_min_max_innodb.test | 0 .../t/handler_read_last.test | 0 .../t/handlersocket.opt | 0 .../t/handlersocket.test | 0 .../{mono_main => eloq_main}/t/having.test | 0 .../t/having_cond_pushdown.test | 0 .../{mono_main => eloq_main}/t/help.test | 0 .../t/host_cache_size_functionality.test | 0 .../t/huge_frm-6224.test | 0 .../t/ignored_index.test | 0 .../t/ignored_index_innodb.test | 0 .../t/implicit_char_to_num_conversion.test | 0 .../t/implicit_commit-master.opt | 0 .../t/implicit_commit.test | 0 .../t/in_datetime_241.test | 0 .../t/in_subq_cond_pushdown.test | 0 .../t/index_intersect.test | 0 .../t/index_intersect_innodb.test | 0 .../t/index_merge_innodb.test | 0 .../t/index_merge_myisam.test | 0 .../t/information_schema-big.test | 0 .../t/information_schema.test | 0 .../t/information_schema2.test | 0 .../information_schema_all_engines-master.opt | 0 .../t/information_schema_all_engines.test | 0 .../t/information_schema_chmod.test | 0 .../t/information_schema_db.test | 0 .../t/information_schema_inno.test | 0 .../t/information_schema_linux.test | 0 .../t/information_schema_parameters.test | 0 .../t/information_schema_part.test | 0 .../t/information_schema_prepare.test | 0 .../t/information_schema_routines.test | 0 .../t/information_schema_stats.test | 0 .../t/init_connect-master.opt | 0 .../t/init_connect.test | 0 .../t/init_connection_query_cache-master.opt | 0 .../t/init_connection_query_cache.test | 0 .../{mono_main => eloq_main}/t/init_file.opt | 0 .../{mono_main => eloq_main}/t/init_file.test | 0 .../t/init_file_longline_3816.opt | 0 .../t/init_file_longline_3816.test | 0 .../t/init_file_set_password-7656.test | 0 .../t/innodb_bug878769.test | 0 .../t/innodb_ext_key.combinations | 0 .../t/innodb_ext_key.test | 0 .../t/innodb_group.test | 0 .../t/innodb_icp.test | 0 .../t/innodb_icp_debug.test | 0 .../t/innodb_ignore_builtin-master.opt | 0 .../t/innodb_ignore_builtin.test | 0 .../t/innodb_load_xa.opt | 0 .../t/innodb_load_xa.test | 0 .../t/innodb_mrr_cpk.test | 0 .../t/innodb_mysql_lock.test | 0 .../t/innodb_mysql_lock2.test | 0 .../t/innodb_mysql_sync.test | 0 .../t/innodb_utf8.test | 0 .../{mono_main => eloq_main}/t/insert.test | 0 .../t/insert_debug-master.opt | 0 .../t/insert_debug.test | 0 .../t/insert_innodb.test | 0 .../t/insert_notembedded.test | 0 .../t/insert_returning.test | 0 .../t/insert_returning_datatypes.test | 0 .../t/insert_select.test | 0 .../t/insert_update.test | 0 .../t/insert_update_autoinc-7150.test | 0 .../{mono_main => eloq_main}/t/intersect.test | 0 .../t/intersect_all.test | 0 .../t/invisible_binlog.test | 0 .../t/invisible_field.test | 0 .../t/invisible_field_debug.test | 0 .../t/invisible_field_grant_completely.test | 0 .../t/invisible_field_grant_system.test | 0 .../t/invisible_partition.test | 0 .../t/ipv4_and_ipv6.opt | 0 .../t/ipv4_and_ipv6.test | 0 .../t/ipv4_as_ipv6-master.opt | 0 .../t/ipv4_as_ipv6.test | 0 .../t/ipv6-master.opt | 0 .../{mono_main => eloq_main}/t/ipv6.test | 0 .../{mono_main => eloq_main}/t/join.test | 0 .../t/join_cache.test | 0 .../t/join_crash.test | 0 .../t/join_nested.test | 0 .../t/join_nested_jcl6.test | 0 .../t/join_optimizer.test | 0 .../t/join_outer.test | 0 .../t/join_outer_innodb.test | 0 .../t/join_outer_jcl6.test | 0 .../{mono_main => eloq_main}/t/key.test | 0 .../t/key_cache-master.opt | 0 .../{mono_main => eloq_main}/t/key_cache.test | 0 .../{mono_main => eloq_main}/t/key_diff.test | 0 .../t/key_primary.test | 0 .../{mono_main => eloq_main}/t/keyread.test | 0 .../{mono_main => eloq_main}/t/keywords.test | 0 .../t/kill-2-master.opt | 0 .../{mono_main => eloq_main}/t/kill-2.test | 0 .../{mono_main => eloq_main}/t/kill.test | 0 .../t/kill_processlist-6619.test | 0 .../t/kill_query-6728.test | 0 .../t/large_pages.opt | 0 .../t/large_pages.test | 0 .../t/last_value.test | 0 .../{mono_main => eloq_main}/t/limit.test | 0 .../t/limit_rows_examined.test | 0 .../{mono_main => eloq_main}/t/loaddata.test | 0 .../t/loaddata_autocom_innodb.test | 0 .../{mono_main => eloq_main}/t/loadxml.test | 0 .../{mono_main => eloq_main}/t/locale.opt | 0 .../{mono_main => eloq_main}/t/locale.test | 0 .../{mono_main => eloq_main}/t/lock.test | 0 .../{mono_main => eloq_main}/t/lock_kill.test | 0 .../t/lock_multi.test | 0 .../t/lock_multi_bug38499.test | 0 .../t/lock_multi_bug38691.test | 0 .../t/lock_sync-master.opt | 0 .../{mono_main => eloq_main}/t/lock_sync.test | 0 .../t/lock_tables_lost_commit-master.opt | 0 .../t/lock_tables_lost_commit.test | 0 .../{mono_main => eloq_main}/t/lock_user.test | 0 .../{mono_main => eloq_main}/t/lock_view.test | 0 .../t/locked_temporary-5955.test | 0 .../t/locking_clause.test | 0 .../t/log_errchk.test | 0 .../{mono_main => eloq_main}/t/log_slow.test | 0 .../t/log_slow_debug.test | 0 .../t/log_state-master.opt | 0 .../{mono_main => eloq_main}/t/log_state.test | 0 .../t/log_state_bug33693-master.opt | 0 .../t/log_state_bug33693.test | 0 .../t/log_tables-big-master.opt | 0 .../t/log_tables-big.test | 0 .../t/log_tables-master.opt | 0 .../t/log_tables.test | 0 .../t/log_tables_debug.test | 0 .../t/log_tables_upgrade.test | 0 .../{mono_main => eloq_main}/t/long_host.test | 0 .../t/long_tmpdir-master.opt | 0 .../t/long_tmpdir-master.sh | 0 .../t/long_tmpdir.test | 0 .../t/long_unique.test | 0 .../t/long_unique_bugs.test | 0 .../t/long_unique_bugs_replication.test | 0 .../t/long_unique_debug.test | 0 .../t/long_unique_delayed.test | 0 .../t/long_unique_innodb.opt | 0 .../t/long_unique_innodb.test | 0 .../t/long_unique_update.test | 0 .../t/long_unique_using_hash.test | 0 .../t/lowercase_fs_off.test | 0 .../t/lowercase_fs_on.test | 0 .../t/lowercase_mixed_tmpdir-master.opt | 0 .../t/lowercase_mixed_tmpdir-master.sh | 0 .../t/lowercase_mixed_tmpdir.test | 0 .../lowercase_mixed_tmpdir_innodb-master.opt | 0 .../t/lowercase_mixed_tmpdir_innodb-master.sh | 0 .../t/lowercase_mixed_tmpdir_innodb.test | 0 .../t/lowercase_table-master.opt | 0 .../t/lowercase_table.test | 0 .../t/lowercase_table2.test | 0 .../t/lowercase_table4-master.opt | 0 .../t/lowercase_table4.test | 0 .../t/lowercase_table5.test | 0 .../t/lowercase_table_grant-master.opt | 0 .../t/lowercase_table_grant.test | 0 .../t/lowercase_table_qcache-master.opt | 0 .../t/lowercase_table_qcache.test | 0 .../t/lowercase_utf8-master.opt | 0 .../t/lowercase_utf8.test | 0 .../t/lowercase_view-master.opt | 0 .../t/lowercase_view.test | 0 .../t/max_password_errors.test | 0 .../t/max_statement_time.test | 0 .../{mono_main => eloq_main}/t/mdev-21101.opt | 0 .../t/mdev-21101.test | 0 .../{mono_main => eloq_main}/t/mdev13607.test | 0 .../{mono_main => eloq_main}/t/mdev19198.test | 0 .../{mono_main => eloq_main}/t/mdev316.test | 0 .../{mono_main => eloq_main}/t/mdev375.test | 0 .../{mono_main => eloq_main}/t/mdev6830.test | 0 .../t/mdev_14586.test | 0 .../t/mdev_19276.test | 0 .../t/mdev_22370.test | 0 .../{mono_main => eloq_main}/t/mdl.test | 0 .../t/mdl_sync-master.opt | 0 .../{mono_main => eloq_main}/t/mdl_sync.test | 0 .../{mono_main => eloq_main}/t/merge-big.test | 0 .../{mono_main => eloq_main}/t/merge.test | 0 .../t/merge_debug.test | 0 .../t/merge_innodb.test | 0 .../t/merge_mmap-master.opt | 0 .../t/merge_mmap.test | 0 .../{mono_main => eloq_main}/t/metadata.test | 0 .../t/mix2_myisam.test | 0 .../t/mix2_myisam_ucs2.test | 0 .../t/mrr_derived_crash_4610.test | 0 .../t/mrr_icp_extra.test | 0 .../t/multi_statement-master.opt | 0 .../t/multi_statement.test | 0 .../t/multi_update-master.opt | 0 .../t/multi_update.test | 0 .../t/multi_update_big.opt | 0 .../t/multi_update_big.test | 0 .../t/multi_update_binlog.test | 0 .../t/multi_update_debug.test | 0 .../t/multi_update_innodb.test | 0 .../t/multi_update_tiny_hash-master.opt | 0 .../t/multi_update_tiny_hash.test | 0 .../t/my_print_defaults.test | 0 .../t/myisam-big.test | 0 .../t/myisam-blob-master.opt | 0 .../t/myisam-blob.test | 0 .../t/myisam-master.opt | 0 .../t/myisam-optimize.test | 0 .../t/myisam-system.test | 0 .../{mono_main => eloq_main}/t/myisam.test | 0 .../myisam_crash_before_flush_keys-master.opt | 0 .../t/myisam_crash_before_flush_keys.test | 0 .../t/myisam_debug.test | 0 .../t/myisam_enable_keys-10506.test | 0 .../t/myisam_explain_non_select_all.test | 0 .../t/myisam_icp.test | 0 .../t/myisam_icp_debug.test | 0 .../t/myisam_icp_notembedded.test | 0 .../t/myisam_mrr.test | 0 .../t/myisam_optimize.test | 0 .../t/myisam_recover-master.opt | 0 .../t/myisam_recover.test | 0 .../t/myisampack.test | 0 .../t/mysql-bug41486.test | 0 .../t/mysql-bug45236.test | 0 .../t/mysql-metadata.test | 0 .../{mono_main => eloq_main}/t/mysql.test | 0 .../t/mysql5613mysql.test | 0 .../t/mysql57_virtual.test | 0 .../t/mysql_binary_mode.test | 0 .../t/mysql_binary_zero_insert.test | 0 .../t/mysql_client_test-master.opt | 0 .../t/mysql_client_test.test | 0 .../t/mysql_client_test_comp-master.opt | 0 .../t/mysql_client_test_comp.test | 0 .../t/mysql_client_test_nonblock-master.opt | 0 .../t/mysql_client_test_nonblock.test | 0 .../t/mysql_comments.sql | 0 .../t/mysql_comments.test | 0 .../t/mysql_cp932.test | 0 .../t/mysql_delimiter.sql | 0 .../t/mysql_delimiter_19799.sql | 0 .../t/mysql_delimiter_source.sql | 0 .../t/mysql_embedded.test | 0 .../t/mysql_install_db_win.test | 0 .../t/mysql_json_mysql_upgrade.test | 0 ...json_mysql_upgrade_with_plugin_loaded.test | 0 .../t/mysql_json_table_recreate.opt | 0 .../t/mysql_json_table_recreate.test | 0 .../t/mysql_locale_posix.test | 0 .../t/mysql_not_windows.test | 0 .../t/mysql_protocols.test | 0 .../t/mysql_tzinfo_to_sql_symlink.test | 0 .../t/mysql_upgrade-20228.test | 0 .../t/mysql_upgrade-6984.opt | 0 .../t/mysql_upgrade-6984.test | 0 .../t/mysql_upgrade.test | 0 .../t/mysql_upgrade_mysql_json_datatype.test | 0 .../t/mysql_upgrade_no_innodb.test | 0 .../t/mysql_upgrade_noengine.test | 0 .../t/mysql_upgrade_ssl.test | 0 .../t/mysql_upgrade_to_100502.test | 0 .../t/mysql_upgrade_view.test | 0 .../t/mysqladmin.test | 0 .../t/mysqlbinlog-innodb.test | 0 .../t/mysqlbinlog-master.opt | 0 .../t/mysqlbinlog.test | 0 .../t/mysqlbinlog_raw_mode.test | 0 .../t/mysqlbinlog_row_big.test | 0 .../t/mysqlbinlog_row_compressed.test | 0 .../t/mysqlbinlog_row_minimal.opt | 0 .../t/mysqlbinlog_row_minimal.test | 0 .../t/mysqlbinlog_stmt_compressed.test | 0 .../t/mysqlcheck-master.opt | 0 .../{mono_main => eloq_main}/t/mysqlcheck.opt | 0 .../t/mysqlcheck.test | 0 .../t/mysqld--defaults-file.test | 0 .../t/mysqld--help-aria.test | 0 .../t/mysqld--help.test | 0 .../t/mysqld_help_crash-9183.test | 0 .../t/mysqld_option_err.test | 0 .../t/mysqldump-compat-102.opt | 0 .../t/mysqldump-compat-102.test | 0 .../t/mysqldump-compat.opt | 0 .../t/mysqldump-compat.test | 0 .../t/mysqldump-max-master.opt | 0 .../t/mysqldump-max.test | 0 .../t/mysqldump-nl.test | 0 .../t/mysqldump-no-binlog-master.opt | 0 .../t/mysqldump-no-binlog.test | 0 .../t/mysqldump-system.test | 0 .../t/mysqldump-utf8mb4.test | 0 .../{mono_main => eloq_main}/t/mysqldump.opt | 0 .../{mono_main => eloq_main}/t/mysqldump.test | 0 .../t/mysqldump_restore.test | 0 .../t/mysqlhotcopy_myisam.test | 0 .../{mono_main => eloq_main}/t/mysqlshow.test | 0 .../{mono_main => eloq_main}/t/mysqlslap.opt | 0 .../{mono_main => eloq_main}/t/mysqlslap.test | 0 .../{mono_main => eloq_main}/t/mysqltest.test | 0 .../t/mysqltest_256.test | 0 .../t/mysqltest_cont_on_error.test | 0 .../t/mysqltest_ps.test | 0 .../t/mysqltest_tracking_info.test | 0 .../t/named_pipe-master.opt | 0 .../t/named_pipe.test | 0 .../t/negation_elimination.test | 0 .../t/nested_profiling.test | 0 .../t/no-threads-master.opt | 0 .../t/no-threads.test | 0 .../{mono_main => eloq_main}/t/no_binlog.test | 0 .../t/non_blocking_api.test | 0 .../t/not_embedded_server.test | 0 .../t/not_partition.test | 0 .../{mono_main => eloq_main}/t/null.test | 0 .../{mono_main => eloq_main}/t/null_key.test | 0 .../{mono_main => eloq_main}/t/odbc.test | 0 .../{mono_main => eloq_main}/t/olap.test | 0 .../t/old-mode-master.opt | 0 .../{mono_main => eloq_main}/t/old-mode.test | 0 .../{mono_main => eloq_main}/t/openssl_1.test | 0 .../t/openssl_6975.combinations | 0 .../t/openssl_6975.test | 0 .../{mono_main => eloq_main}/t/opt_trace.test | 0 .../t/opt_trace_index_merge.test | 0 .../t/opt_trace_index_merge_innodb.test | 0 .../t/opt_trace_security.test | 0 .../t/opt_trace_ucs2.test | 0 .../{mono_main => eloq_main}/t/opt_tvc.test | 0 .../t/order_by-mdev-10122.test | 0 .../{mono_main => eloq_main}/t/order_by.test | 0 .../t/order_by_innodb.test | 0 .../t/order_by_optimizer.test | 0 .../t/order_by_optimizer_innodb.test | 0 .../t/order_by_pack_big.test | 0 .../t/order_by_sortkey.test | 0 .../t/order_by_zerolength-4285.test | 0 .../t/order_fill_sortbuf.test | 0 .../{mono_main => eloq_main}/t/outfile.test | 0 .../t/outfile_loaddata.test | 0 .../{mono_main => eloq_main}/t/overflow.test | 0 .../{mono_main => eloq_main}/t/packet.test | 0 .../{mono_main => eloq_main}/t/parser.test | 0 .../t/parser_bug21114_innodb.test | 0 .../t/parser_not_embedded.test | 0 .../t/parser_stack.test | 0 .../t/partition-master.opt | 0 .../{mono_main => eloq_main}/t/partition.test | 0 .../t/partition_alter.test | 0 .../t/partition_binlog.test | 0 .../t/partition_binlog_stmt.test | 0 .../t/partition_blackhole.test | 0 .../t/partition_bug18198.test | 0 .../t/partition_cache.test | 0 .../t/partition_cache_innodb.test | 0 .../t/partition_cache_myisam.test | 0 .../t/partition_charset.test | 0 .../t/partition_column.test | 0 .../t/partition_column_prune.test | 0 .../t/partition_csv.test | 0 .../t/partition_datatype.test | 0 .../t/partition_debug_sync.test | 0 .../t/partition_default.test | 0 .../t/partition_disabled-master.opt | 0 .../t/partition_disabled.test | 0 .../t/partition_error.test | 0 .../t/partition_example.opt | 0 .../t/partition_example.test | 0 .../t/partition_exchange-master.opt | 0 .../t/partition_exchange.test | 0 .../t/partition_explicit_prune.test | 0 .../t/partition_grant.test | 0 .../t/partition_hash.test | 0 .../t/partition_innodb.test | 0 .../t/partition_innodb_plugin.test | 0 ...artition_innodb_semi_consistent-master.opt | 0 .../t/partition_innodb_semi_consistent.test | 0 .../t/partition_innodb_stmt.test | 0 .../t/partition_key_cache.test | 0 .../t/partition_list.test | 0 .../t/partition_mgm.test | 0 .../t/partition_mgm_err.test | 0 .../t/partition_mgm_err2.test | 0 .../t/partition_mrr_aria.test | 0 .../t/partition_mrr_innodb.test | 0 .../t/partition_mrr_myisam.test | 0 .../t/partition_myisam.test | 0 .../t/partition_not_blackhole-master.opt | 0 .../t/partition_not_blackhole.test | 0 .../t/partition_not_windows-master.opt | 0 .../t/partition_not_windows.test | 0 .../t/partition_open_files_limit-master.opt | 0 .../t/partition_open_files_limit.test | 0 .../t/partition_order.test | 0 .../t/partition_pruning.test | 0 .../t/partition_range.test | 0 .../t/partition_rename_longfilename.test | 0 .../t/partition_symlink.test | 0 .../t/partition_sync.test | 0 .../t/partition_truncate.test | 0 .../t/partition_ucs2.test | 0 .../t/partition_utf8-debug.test | 0 .../t/partition_utf8.test | 0 .../t/partition_windows.test | 0 .../t/password_expiration.test | 0 .../t/password_expiration_unix_socket.test | 0 .../t/percona_nonflushing_analyze_debug.test | 0 .../t/perror-win.test | 0 .../{mono_main => eloq_main}/t/perror.test | 0 .../{mono_main => eloq_main}/t/plugin.opt | 0 .../{mono_main => eloq_main}/t/plugin.test | 0 .../t/plugin_auth.test | 0 .../t/plugin_auth_qa.test | 0 .../t/plugin_auth_qa_1.test | 0 .../t/plugin_auth_qa_2-master.opt | 0 .../t/plugin_auth_qa_2.test | 0 .../t/plugin_auth_qa_3-master.opt | 0 .../t/plugin_auth_qa_3.test | 0 .../t/plugin_innodb.opt | 0 .../t/plugin_innodb.test | 0 .../t/plugin_load.opt | 0 .../t/plugin_load.test | 0 .../t/plugin_load_option.opt | 0 .../t/plugin_load_option.test | 0 .../t/plugin_loaderr.opt | 0 .../t/plugin_loaderr.test | 0 .../t/plugin_maturity-master.opt | 0 .../t/plugin_maturity.test | 0 .../t/plugin_not_embedded.opt | 0 .../t/plugin_not_embedded.test | 0 .../t/plugin_vars.test | 0 .../t/pool_of_threads.cnf | 0 .../t/pool_of_threads.test | 0 .../t/precedence.test | 0 .../t/precedence_bugs.test | 0 .../{mono_main => eloq_main}/t/preload.test | 0 .../{mono_main => eloq_main}/t/prepare.test | 0 .../t/processlist.test | 0 .../t/processlist_notembedded.test | 0 .../{mono_main => eloq_main}/t/profiling.test | 0 .../t/progress_976225.test | 0 .../{mono_main => eloq_main}/t/ps-master.opt | 0 .../{mono_main => eloq_main}/t/ps.test | 0 .../t/ps_10nestset.test | 0 .../{mono_main => eloq_main}/t/ps_11bugs.test | 0 .../t/ps_1general.test | 0 .../t/ps_2myisam.test | 0 .../t/ps_3innodb-master.opt | 0 .../t/ps_3innodb.test | 0 .../{mono_main => eloq_main}/t/ps_4heap.test | 0 .../{mono_main => eloq_main}/t/ps_5merge.test | 0 .../t/ps_change_master.test | 0 .../{mono_main => eloq_main}/t/ps_ddl.test | 0 .../{mono_main => eloq_main}/t/ps_ddl1.test | 0 .../{mono_main => eloq_main}/t/ps_error.test | 0 .../{mono_main => eloq_main}/t/ps_grant.test | 0 .../{mono_main => eloq_main}/t/ps_innodb.test | 0 .../t/ps_max_subselect-5113.test | 0 .../t/ps_missed_cmds.test | 0 .../t/ps_missed_cmds_bin_prot.test | 0 .../ps_missed_cmds_bin_prot_not_embedded.test | 0 .../t/ps_missed_cmds_not_embedded.test | 0 .../t/ps_not_windows.test | 0 .../t/ps_qc_innodb.test | 0 .../t/ps_show_log.test | 0 .../t/query_cache.test | 0 .../t/query_cache_28249.test | 0 .../t/query_cache_debug.test | 0 .../t/query_cache_innodb.test | 0 .../t/query_cache_merge.test | 0 .../t/query_cache_notembedded-master.opt | 0 .../t/query_cache_notembedded.test | 0 .../t/query_cache_ps_no_prot.test | 0 .../t/query_cache_ps_ps_prot.test | 0 .../t/query_cache_with_views.test | 0 .../t/quick_select_4161.test | 0 .../{mono_main => eloq_main}/t/range.test | 0 .../t/range_debug.test | 0 .../t/range_innodb.test | 0 .../t/range_interrupted-13751.test | 0 .../t/range_mrr_icp.test | 0 .../t/range_notembedded.test | 0 .../t/range_vs_index_merge.test | 0 .../t/range_vs_index_merge_innodb.test | 0 .../t/read_many_rows_innodb.test | 0 .../{mono_main => eloq_main}/t/read_only.test | 0 .../t/read_only_innodb.test | 0 .../{mono_main => eloq_main}/t/rename.test | 0 .../{mono_main => eloq_main}/t/renamedb.test | 0 .../t/reopen_temp_table.test | 0 .../{mono_main => eloq_main}/t/repair.test | 0 .../t/repair_symlink-5543.test | 0 .../{mono_main => eloq_main}/t/replace.test | 0 .../t/replace_returning.test | 0 .../t/replace_returning_datatypes.test | 0 .../t/replace_returning_err.test | 0 .../t/require_secure_transport-master.opt | 0 .../t/require_secure_transport.test | 0 .../t/reset_connection.test | 0 .../{mono_main => eloq_main}/t/rollback.test | 0 .../{mono_main => eloq_main}/t/round.test | 0 .../t/row-checksum-master.opt | 0 .../t/row-checksum-old-master.opt | 0 .../t/row-checksum-old.test | 0 .../t/row-checksum.opt | 0 .../t/row-checksum.test | 0 .../{mono_main => eloq_main}/t/row.test | 0 .../t/rowid_filter.test | 0 .../t/rowid_filter_innodb.test | 0 .../t/rowid_filter_innodb_debug.test | 0 .../t/rowid_filter_myisam.test | 0 .../t/rowid_filter_myisam_debug.test | 0 .../t/rowid_order_innodb.test | 0 .../{mono_main => eloq_main}/t/rownum.test | 0 .../t/rpl_mysql_upgrade_slave_repo_check.test | 0 .../t/rpl_mysqldump_slave.test | 0 .../{mono_main => eloq_main}/t/schema.test | 0 .../t/second_frac-9175.test | 0 .../t/secure_file_priv_win-master.opt | 0 .../t/secure_file_priv_win.test | 0 .../{mono_main => eloq_main}/t/select.test | 0 .../t/select_debug.test | 0 .../t/select_found.test | 0 .../t/select_jcl6.test | 0 .../t/select_pkeycache-master.opt | 0 .../t/select_pkeycache.test | 0 .../t/select_safe.test | 0 .../t/selectivity.opt | 0 .../t/selectivity.test | 0 .../t/selectivity_innodb.test | 0 .../t/selectivity_no_engine.test | 0 .../{mono_main => eloq_main}/t/servers.test | 0 .../t/session_tracker_last_gtid.test | 0 .../t/set_operation.test | 0 .../t/set_operation_oracle.test | 0 .../t/set_password.test | 0 .../t/set_statement.test | 0 .../t/set_statement_debug.test | 0 .../t/set_statement_notembedded.test | 0 .../t/set_statement_notembedded_binlog.test | 0 .../t/set_statement_profiling.test | 0 .../{mono_main => eloq_main}/t/show.test | 0 .../t/show_bad_definer-5553.test | 0 .../t/show_check-master.opt | 0 .../t/show_check.test | 0 .../t/show_create_user.test | 0 .../t/show_explain.cc | 0 .../t/show_explain.opt | 0 .../t/show_explain.test | 0 .../t/show_explain_non_select.test | 0 .../t/show_explain_ps.test | 0 ...function_with_pad_char_to_full_length.test | 0 .../t/show_profile.test | 0 .../t/show_row_order-9226.test | 0 .../{mono_main => eloq_main}/t/shutdown.test | 0 .../t/shutdown_not_windows.combinations | 0 .../t/shutdown_not_windows.test | 0 .../t/sighup-6580.test | 0 .../{mono_main => eloq_main}/t/signal.test | 0 .../t/signal_code.test | 0 .../t/signal_demo1.test | 0 .../t/signal_demo2.test | 0 .../t/signal_demo3.test | 0 .../t/signal_sqlmode.test | 0 .../t/simultaneous_assignment.test | 0 .../t/single_delete_update.test | 0 .../t/single_delete_update_innodb.test | 0 .../t/skip_grants.opt | 0 .../t/skip_grants.test | 0 .../t/skip_log_bin-master.opt | 0 .../t/skip_log_bin.test | 0 .../t/skip_name_resolve-master.opt | 0 .../t/skip_name_resolve.test | 0 .../t/slowlog_enospace-10508.test | 0 .../t/sp-anchor-row-type-cursor.test | 0 .../t/sp-anchor-row-type-table.test | 0 .../t/sp-anchor-type.test | 0 .../{mono_main => eloq_main}/t/sp-big.test | 0 .../{mono_main => eloq_main}/t/sp-bugs.test | 0 .../{mono_main => eloq_main}/t/sp-bugs2.test | 0 .../{mono_main => eloq_main}/t/sp-code.test | 0 .../t/sp-condition-handler.test | 0 .../{mono_main => eloq_main}/t/sp-cursor.test | 0 .../t/sp-destruct.test | 0 .../t/sp-dynamic.test | 0 .../{mono_main => eloq_main}/t/sp-error.test | 0 .../{mono_main => eloq_main}/t/sp-expr.test | 0 .../{mono_main => eloq_main}/t/sp-fib.test | 0 .../t/sp-for-loop.test | 0 .../{mono_main => eloq_main}/t/sp-group.test | 0 .../{mono_main => eloq_main}/t/sp-innodb.test | 0 .../{mono_main => eloq_main}/t/sp-lock.test | 0 .../t/sp-no-code.test | 0 .../t/sp-no-valgrind.test | 0 .../t/sp-prelocking.test | 0 .../t/sp-row-vs-var.inc | 0 .../{mono_main => eloq_main}/t/sp-row.test | 0 .../t/sp-security-anchor-type.test | 0 .../t/sp-security.test | 0 .../t/sp-threads.test | 0 .../{mono_main => eloq_main}/t/sp-ucs2.test | 0 .../{mono_main => eloq_main}/t/sp-vars.test | 0 .../{mono_main => eloq_main}/t/sp.test | 0 .../{mono_main => eloq_main}/t/sp2.test | 0 .../{mono_main => eloq_main}/t/sp_gis.test | 0 .../t/sp_missing_4665.test | 0 .../t/sp_notembedded.opt | 0 .../t/sp_notembedded.test | 0 .../t/sp_stress_case.test | 0 .../{mono_main => eloq_main}/t/sp_sync.test | 0 .../{mono_main => eloq_main}/t/sp_trans.test | 0 .../t/sp_trans_log.test | 0 .../{mono_main => eloq_main}/t/sql_mode.test | 0 .../t/sql_safe_updates.opt | 0 .../t/sql_safe_updates.test | 0 .../{mono_main => eloq_main}/t/ssl-big.test | 0 .../{mono_main => eloq_main}/t/ssl.test | 0 .../t/ssl_7937.combinations | 0 .../{mono_main => eloq_main}/t/ssl_7937.test | 0 .../t/ssl_8k_key-master.opt | 0 .../t/ssl_8k_key.test | 0 .../t/ssl_and_innodb.test | 0 .../{mono_main => eloq_main}/t/ssl_ca.test | 0 .../{mono_main => eloq_main}/t/ssl_cipher.opt | 0 .../t/ssl_cipher.test | 0 .../t/ssl_compress.test | 0 .../t/ssl_connect.test | 0 .../t/ssl_crl.combinations | 0 .../{mono_main => eloq_main}/t/ssl_crl.test | 0 .../t/ssl_crl_clients.test | 0 .../t/ssl_system_ca.combinations | 0 .../t/ssl_system_ca.test | 0 .../t/ssl_timeout-9836.opt | 0 .../t/ssl_timeout-9836.test | 0 .../t/ssl_timeout.test | 0 .../t/ssl_verify_ip.opt | 0 .../t/ssl_verify_ip.test | 0 .../t/stack-crash.test | 0 .../t/stat_tables-enospc.test | 0 .../t/stat_tables.test | 0 .../t/stat_tables_disabled.test | 0 .../t/stat_tables_innodb.test | 0 .../t/stat_tables_innodb_debug.test | 0 .../t/stat_tables_missing.test | 0 .../t/stat_tables_myisam_debug.test | 0 .../t/stat_tables_par.inc | 0 .../t/stat_tables_par.test | 0 .../t/stat_tables_par_innodb.test | 0 .../t/stat_tables_partition.test | 0 .../t/stat_tables_rbr.test | 0 .../t/stat_tables_repl.test | 0 .../t/statement-expr.test | 0 .../t/statistics.test | 0 .../t/statistics_close.test | 0 .../t/statistics_index_crash-7362.test | 0 .../t/status-master.opt | 0 .../{mono_main => eloq_main}/t/status.test | 0 .../{mono_main => eloq_main}/t/status2.test | 0 .../t/status_bug17954.test | 0 .../t/str_to_datetime_457.test | 0 .../t/strict-master.opt | 0 .../{mono_main => eloq_main}/t/strict.test | 0 .../t/strict_autoinc_1myisam.test | 0 .../t/strict_autoinc_2innodb.test | 0 .../t/strict_autoinc_3heap.test | 0 .../{mono_main => eloq_main}/t/strings.test | 0 .../t/subselect-crash_15755.test | 0 .../{mono_main => eloq_main}/t/subselect.test | 0 .../t/subselect2.test | 0 .../{mono_main => eloq_main}/t/subselect3.inc | 0 .../t/subselect3.test | 0 .../t/subselect3_jcl6.test | 0 .../t/subselect4.test | 0 .../t/subselect_cache.test | 0 .../t/subselect_debug.test | 0 .../t/subselect_exists2in.test | 0 .../t/subselect_exists2in_costmat.cnf | 0 .../t/subselect_exists2in_costmat.test | 0 .../t/subselect_extra.test | 0 .../t/subselect_extra_no_semijoin.test | 0 .../t/subselect_gis.test | 0 .../t/subselect_innodb.test | 0 .../t/subselect_mat.test | 0 .../t/subselect_mat_cost-master.opt | 0 .../t/subselect_mat_cost.cnf | 0 .../t/subselect_mat_cost.test | 0 .../t/subselect_mat_cost_bugs.test | 0 .../t/subselect_no_exists_to_in.test | 0 .../t/subselect_no_mat.test | 0 .../t/subselect_no_opts.test | 0 .../t/subselect_no_scache.test | 0 .../t/subselect_no_semijoin.test | 0 .../t/subselect_notembedded.test | 0 .../t/subselect_nulls.test | 0 .../t/subselect_partial_match.test | 0 .../t/subselect_sj.test | 0 .../t/subselect_sj2.test | 0 .../t/subselect_sj2_jcl6.test | 0 .../t/subselect_sj2_mat.test | 0 .../t/subselect_sj_aria.test | 0 .../t/subselect_sj_jcl6.test | 0 .../t/subselect_sj_mat.test | 0 .../t/subselect_sj_nonmerged.test | 0 .../t/sum_distinct-big.test | 0 .../t/sum_distinct.test | 0 .../t/symlink-aria-11902.test | 0 .../t/symlink-myisam-11902.test | 0 .../{mono_main => eloq_main}/t/symlink.test | 0 .../t/synchronization.test | 0 .../t/sysdate_is_now-master.opt | 0 .../t/sysdate_is_now.test | 0 .../t/system_mysql_db.test | 0 .../t/system_mysql_db_507.test | 0 .../t/system_mysql_db_error_log-master.opt | 0 .../t/system_mysql_db_error_log.test | 0 .../t/system_mysql_db_fix40123.test | 0 .../t/system_mysql_db_fix50030.test | 0 .../t/system_mysql_db_fix50117.test | 0 .../t/system_mysql_db_refs.test | 0 .../t/system_time_debug.test | 0 .../t/table_elim.test | 0 .../t/table_elim_debug.test | 0 .../t/table_keyinfo-6838.test | 0 .../t/table_options-5867.opt | 0 .../t/table_options-5867.test | 0 .../t/table_options.test | 0 .../t/table_value_constr.test | 0 .../{mono_main => eloq_main}/t/tablelock.test | 0 .../t/tablespace.test | 0 .../t/tc_heuristic_recover.test | 0 .../t/temp_table-master.opt | 0 .../t/temp_table.test | 0 .../t/temp_table_frm.test | 0 .../t/temp_table_symlink.test | 0 .../t/temporal_literal.test | 0 .../t/temporal_scale_4283.test | 0 .../t/thread_id_overflow.test | 0 .../t/thread_pool_info.opt | 0 .../t/thread_pool_info.test | 0 .../{mono_main => eloq_main}/t/timeout.test | 0 .../t/timezone-master.opt | 0 .../{mono_main => eloq_main}/t/timezone.test | 0 .../{mono_main => eloq_main}/t/timezone2.test | 0 .../t/timezone3-master.opt | 0 .../{mono_main => eloq_main}/t/timezone3.test | 0 .../t/timezone4-master.opt | 0 .../{mono_main => eloq_main}/t/timezone4.test | 0 .../t/timezone_grant.test | 0 .../t/tls_version.opt | 0 .../t/tls_version.test | 0 .../t/tls_version1.opt | 0 .../t/tls_version1.test | 0 .../t/tmp_table_count-7586.test | 0 .../t/trans_read_only-master.opt | 0 .../t/trans_read_only.test | 0 .../t/transaction_timeout.test | 0 .../t/trigger-compat.test | 0 .../t/trigger-trans.test | 0 .../{mono_main => eloq_main}/t/trigger.test | 0 .../t/trigger_no_defaults-11698.test | 0 .../t/trigger_notembedded.test | 0 .../t/trigger_null-8605.test | 0 .../t/trigger_wl3253.test | 0 .../t/truncate-stale-6500.test | 0 .../{mono_main => eloq_main}/t/truncate.test | 0 .../t/truncate_badse.opt | 0 .../t/truncate_badse.test | 0 .../t/truncate_coverage.test | 0 .../t/truncate_notembedded.test | 0 .../t/type_binary.test | 0 .../{mono_main => eloq_main}/t/type_bit.test | 0 .../t/type_bit_innodb.test | 0 .../{mono_main => eloq_main}/t/type_blob.test | 0 .../{mono_main => eloq_main}/t/type_date.test | 0 .../t/type_date_round.test | 0 .../t/type_datetime.test | 0 .../t/type_datetime_hires.test | 0 .../t/type_datetime_round.test | 0 .../t/type_decimal.test | 0 .../{mono_main => eloq_main}/t/type_enum.test | 0 .../t/type_float.test | 0 .../t/type_hex_hybrid.test | 0 .../{mono_main => eloq_main}/t/type_int.test | 0 .../t/type_interval.test | 0 .../{mono_main => eloq_main}/t/type_json.test | 0 .../t/type_nchar.test | 0 .../t/type_newdecimal-big.test | 0 .../t/type_newdecimal.test | 0 .../{mono_main => eloq_main}/t/type_num.test | 0 .../t/type_num_innodb.test | 0 .../t/type_ranges.test | 0 .../{mono_main => eloq_main}/t/type_row.test | 0 .../{mono_main => eloq_main}/t/type_set.test | 0 .../t/type_temporal_innodb.test | 0 .../t/type_temporal_mariadb53.test | 0 .../t/type_temporal_mysql56.test | 0 .../t/type_temporal_mysql56_debug.test | 0 .../{mono_main => eloq_main}/t/type_time.test | 0 .../t/type_time_6065.test | 0 .../t/type_time_hires.test | 0 .../t/type_time_round.test | 0 .../t/type_timestamp.test | 0 .../t/type_timestamp_hires.test | 0 .../t/type_timestamp_round.test | 0 .../{mono_main => eloq_main}/t/type_uint.test | 0 .../t/type_varchar.opt | 0 .../t/type_varchar.test | 0 .../t/type_varchar_mysql41.test | 0 .../{mono_main => eloq_main}/t/type_year.test | 0 .../{mono_main => eloq_main}/t/udf.test | 0 .../t/udf_debug_sync.test | 0 .../t/udf_notembedded.test | 0 .../t/udf_query_cache.test | 0 .../t/udf_skip_grants-master.opt | 0 .../t/udf_skip_grants.test | 0 .../t/union-master.opt | 0 .../{mono_main => eloq_main}/t/union.test | 0 .../t/union_crash-714.test | 0 .../{mono_main => eloq_main}/t/unique.test | 0 .../t/unsafe_binlog_innodb.test | 0 .../{mono_main => eloq_main}/t/update.test | 0 .../t/update_ignore_216.test | 0 .../t/update_innodb.test | 0 .../t/update_use_source.test | 0 .../{mono_main => eloq_main}/t/upgrade.opt | 0 .../{mono_main => eloq_main}/t/upgrade.test | 0 .../t/upgrade_MDEV-19650.test | 0 .../t/upgrade_MDEV-23102-1.test | 0 .../t/upgrade_MDEV-23102-2.test | 0 .../t/upgrade_mdev_24363.test | 0 .../t/user_limits-master.opt | 0 .../t/user_limits.test | 0 .../t/user_var-binlog.test | 0 .../{mono_main => eloq_main}/t/user_var.test | 0 .../t/userstat-badlogin-4824.test | 0 .../{mono_main => eloq_main}/t/userstat.opt | 0 .../{mono_main => eloq_main}/t/userstat.test | 0 .../{mono_main => eloq_main}/t/varbinary.test | 0 .../t/variables-master.opt | 0 .../t/variables-notembedded-master.opt | 0 .../t/variables-notembedded.test | 0 .../{mono_main => eloq_main}/t/variables.test | 0 .../t/variables_community.test | 0 .../{mono_main => eloq_main}/t/view.test | 0 .../t/view_alias.test | 0 .../t/view_debug.test | 0 .../t/view_grant.test | 0 .../t/wait_timeout.test | 0 .../t/warnings-master.opt | 0 .../{mono_main => eloq_main}/t/warnings.test | 0 .../t/warnings_debug.test | 0 .../t/warnings_engine_disabled.test | 0 .../{mono_main => eloq_main}/t/win.test | 0 .../t/win_as_arg_to_aggregate_func.test | 0 .../{mono_main => eloq_main}/t/win_avg.test | 0 .../t/win_big-mdev-10092.test | 0 .../t/win_big-mdev-11697.test | 0 .../{mono_main => eloq_main}/t/win_big.test | 0 .../{mono_main => eloq_main}/t/win_bit.test | 0 .../t/win_empty_over.test | 0 .../t/win_first_last_value.test | 0 .../{mono_main => eloq_main}/t/win_i_s.test | 0 .../t/win_insert_select.test | 0 .../t/win_lead_lag.test | 0 .../t/win_min_max.test | 0 .../t/win_nth_value.test | 0 .../{mono_main => eloq_main}/t/win_ntile.test | 0 .../t/win_orderby.test | 0 .../t/win_percent_cume.test | 0 .../t/win_percentile.test | 0 .../{mono_main => eloq_main}/t/win_rank.test | 0 .../{mono_main => eloq_main}/t/win_std.test | 0 .../{mono_main => eloq_main}/t/win_sum.test | 0 .../{mono_main => eloq_main}/t/windows.test | 0 .../t/windows_debug.test | 0 .../t/wl4435_generated.inc | 0 .../{mono_main => eloq_main}/t/wolfssl.opt | 0 .../{mono_main => eloq_main}/t/wolfssl.test | 0 .../{mono_main => eloq_main}/t/xa.test | 0 .../{mono_main => eloq_main}/t/xa_binlog.test | 0 .../t/xa_prepared_binlog_off-master.opt | 0 .../t/xa_prepared_binlog_off.test | 0 .../{mono_main => eloq_main}/t/xa_sync.test | 0 .../{mono_main => eloq_main}/t/xml.test | 0 .../t/xtradb_mrr.test | 0 .../{mono_multi => eloq_multi}/disabled.def | 0 .../include/have_eloq.inc | 0 .../include/have_hash_partition.inc | 0 .../include/have_range_partition.inc | 0 .../include/mono_connect.inc | 0 .../include/mono_connection.inc | 0 .../include/mono_init.inc | 0 .../{mono_multi => eloq_multi}/my.cnf | 0 .../r/alter_schema_term_changed.result | 0 .../r/alter_view.result | 0 .../r/batch_pk_load.result | 0 .../r/bug172.result | 0 .../r/check_blocked_request.result | 0 .../r/create_after_drop.result | 0 .../r/create_drop_db.result | 0 .../r/create_drop_function.result | 0 .../r/create_drop_index.result | 0 .../r/create_drop_procedure.result | 0 .../r/create_drop_view.result | 0 .../r/create_table_flush_kv_fail.result | 0 .../r/fault_create_drop_index.result | 0 .../r/fault_inject_for_upsert_1.result | 0 .../r/fault_inject_for_upsert_2.result | 0 .../r/fault_inject_for_upsert_3.result | 0 .../r/fault_inject_for_upsert_table.result | 0 .../r/fault_inject_term_neg_Execute.result | 0 .../r/flush_privileges.result | 0 .../r/improve_ckpt_flush_undo.result | 0 .../r/improve_ckpt_flush_undo_sk1.result | 0 .../r/improve_ckpt_flush_undo_sk2.result | 0 .../r/init_tx_failure.result | 0 .../r/m_scan_remainer_lock.result | 0 .../r/mono_auto_increment.result | 0 .../r/multi_dead_lock_check.result | 0 .../r/multi_nodes.result | 0 .../r/range_split.result | 0 .../r/range_split_keycache.result | 0 .../r/range_split_recovery.result | 0 .../r/range_split_write_forward.result | 0 .../r/read_pk_using_sk.result | 0 .../r/recover_committed_tx.result | 0 .../r/recover_timeout.result | 0 .../r/recover_uncommitted_tx.result | 0 .../r/temporary_table.result | 0 .../r/tx_timeout.result | 0 .../r/tx_timeout_on_remote_response.result | 0 .../t/alter_schema_term_changed.test | 0 .../t/alter_view.test | 0 .../t/batch_pk_load.test | 0 .../{mono_multi => eloq_multi}/t/bug172.test | 0 .../t/check_blocked_request.cnf | 0 .../t/check_blocked_request.test | 0 .../t/create_after_drop.test | 0 .../t/create_drop_db.test | 0 .../t/create_drop_function.test | 0 .../t/create_drop_index.test | 0 .../t/create_drop_procedure.test | 0 .../t/create_drop_view.test | 0 .../t/create_table_flush_kv_fail.test | 0 .../t/fault_create_drop_index.test | 0 .../t/fault_inject_for_upsert_1.test | 0 .../t/fault_inject_for_upsert_2.test | 0 .../t/fault_inject_for_upsert_3.test | 0 .../t/fault_inject_for_upsert_table.test | 0 .../t/fault_inject_term_neg_Execute.test | 0 .../t/flush_privileges.test | 0 .../t/improve_ckpt_flush_undo.cnf | 0 .../t/improve_ckpt_flush_undo.test | 0 .../t/improve_ckpt_flush_undo_sk1.cnf | 0 .../t/improve_ckpt_flush_undo_sk1.test | 0 .../t/improve_ckpt_flush_undo_sk2.cnf | 0 .../t/improve_ckpt_flush_undo_sk2.test | 0 .../t/init_tx_failure.test | 0 .../t/m_scan_remainer_lock.test | 0 .../t/mono_auto_increment.test | 0 .../t/multi_dead_lock_check.cnf | 0 .../t/multi_dead_lock_check.test | 0 .../t/multi_nodes.test | 0 .../t/range_split.test | 0 .../t/range_split_keycache.cnf | 0 .../t/range_split_keycache.test | 0 .../t/range_split_recovery.cnf | 0 .../t/range_split_recovery.test | 0 .../t/range_split_write_forward.test | 0 .../t/read_pk_using_sk.test | 0 .../t/recover_committed_tx.test | 0 .../t/recover_timeout.test | 0 .../t/recover_uncommitted_tx.test | 0 .../t/temporary_table.test | 0 .../t/tx_timeout.cnf | 0 .../t/tx_timeout.test | 0 .../t/tx_timeout_on_remote_response.test | 0 2736 files changed, 80 insertions(+), 501 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 CREDITS delete mode 100644 INSTALL-WIN-SOURCE delete mode 100644 KNOWN_BUGS.txt delete mode 100644 appveyor.yml rename my-config.cnf => scripts/eloqsql.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/disabled.def (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/include/have_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/include/have_hash_partition.inc (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/include/have_range_partition.inc (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/include/update_use_source_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/my.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/alter_db.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/alter_table.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/alter_table_recovery.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/auto_commit.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/batch_pk_load_s.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/collation_restriction.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/create_drop_index.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/create_drop_table_recovery.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/data_store_error.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/data_type.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/deadlock_handling.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/drop_table.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/fault_inject_term_neg_Execute.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/flush_undo_while_ckpt.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/isolation_level_for_locking.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/isolation_level_for_mvcc.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/isolation_level_for_occ.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/key_cache.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/magic_table_name.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/merge_scanner_wset.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/mvcc_archives_recycle.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/mvcc_read_after_flushing_deleted_record.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/mvcc_read_unique_sk_after_flushing_deleted_record.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/mvcc_scan.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/mvcc_scan_after_flushing_deleted_record.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/mvcc_scan_sk.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/mvcc_unique_sk_lookup.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/poor_performance.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/primary_key.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/pushdown_cond.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/range_split_keycache.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/read_committed_sk_scan.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/rnd.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/s_scan_remainer_lock.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/secondary_key.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/select_for_update_and_share.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/select_for_update_and_share_occ.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/single_auto_increment.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/single_dead_lock_check.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/single_node.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/statistics.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/temporary_table.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/unique_sk_lookup.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/unsupported_sql.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/update_record_with_sk.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/upsert_table_recovery.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/r/write_log_unknown.result (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/alter_db.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/alter_table.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/alter_table_recovery.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/auto_commit.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/batch_pk_load_s.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/collation_restriction.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/create_drop_index.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/create_drop_table_recovery.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/data_store_error.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/data_type.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/deadlock_handling.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/deadlock_handling.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/drop_table.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/fault_inject_term_neg_Execute.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/flush_undo_while_ckpt.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/flush_undo_while_ckpt.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/isolation_level_for_locking.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/isolation_level_for_locking.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/isolation_level_for_mvcc.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/isolation_level_for_mvcc.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/isolation_level_for_occ.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/isolation_level_for_occ.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/key_cache.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/key_cache.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/magic_table_name.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/merge_scanner_wset.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_archives_recycle.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_archives_recycle.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_read_after_flushing_deleted_record.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_read_after_flushing_deleted_record.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_read_unique_sk_after_flushing_deleted_record.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_read_unique_sk_after_flushing_deleted_record.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_scan.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_scan.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_scan_after_flushing_deleted_record.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_scan_after_flushing_deleted_record.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_scan_sk.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_scan_sk.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_scan_sk_rc_isolvl.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_scan_sk_rc_isolvl.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_unique_sk_lookup.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/mvcc_unique_sk_lookup.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/poor_performance.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/poor_performance.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/primary_key.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/pushdown_cond.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/range_split_keycache.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/range_split_keycache.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/read_committed_sk_scan.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/rnd.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/s_scan_remainer_lock.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/secondary_key.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/select_for_update_and_share.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/select_for_update_and_share.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/select_for_update_and_share_occ.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/select_for_update_and_share_occ.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/single_auto_increment.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/single_dead_lock_check.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/single_dead_lock_check.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/single_node.cnf (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/single_node.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/statistics.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/temporary_table.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/unique_sk_lookup.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/unsupported_sql.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/update_record_with_sk.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/upsert_table_recovery.test (100%) rename storage/eloq/mysql-test/{mono_basic => eloq_basic}/t/write_log_unknown.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/disabled.def (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/bytes_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/common-tests_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_czech_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_eloq_like.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_filesort_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_like_cond_propagation_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_like_ignorable_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_like_range_f1f2_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_like_range_mdev14350_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_myanmar_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_numconv_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_pad_all_engines_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_thai_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_unescape_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ctype_utf8_ilseq_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/dbt3_s001_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/default_charset_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/equal_fields_propagation_datetime_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/func_hybrid_type_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/func_str_ascii_checksum_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/function_defaults_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/function_defaults_notembedded_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/have_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/have_utf8mb4_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/ipv6_clients_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/mrr_tests_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/mysqldump_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/query_cache_sql_prepare_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/switch_to_mysql_global_priv_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/switch_to_mysql_user_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/type_hrtime_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/type_temporal_zero_default_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/update_use_source_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/world_schema_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/world_schema_eloq1.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/include/world_schema_eloq2.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/my.cnf (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/1st.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/aborted_clients.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/adddate_454.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alias.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/almost_full.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_events.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_table,aria.rdiff (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_table,heap.rdiff (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_table-big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_table.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_table_autoinc-5574.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_table_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_table_errors.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_table_mdev539_maria.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_table_mdev539_myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_table_online.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_table_trans.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/alter_user.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/analyze.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/analyze_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/analyze_format_json.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/analyze_stmt.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/analyze_stmt_orderby.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/analyze_stmt_privileges.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/analyze_stmt_privileges2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/analyze_stmt_slow_query_log.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ansi.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/aria_icp_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/assign_key_cache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/assign_key_cache_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/auth_named_pipe.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/auth_rpl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/auto_increment.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/auto_increment_ranges_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/auto_increment_ranges_myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/backup_aria.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/backup_interaction.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/backup_lock.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/backup_lock_binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/backup_lock_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/backup_locks.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/backup_log.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/backup_priv.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/backup_stages.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/backup_syntax.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bad_frm_crash_5029.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bench_count_distinct.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bigint.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/binary.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/binary_to_hex.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bind_address_resolution.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/blackhole.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/blackhole_plugin.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bool.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bootstrap.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bootstrap_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/brackets.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bug12427262.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bug13633383.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bug39022.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bug46760.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bug47671.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bug58669.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/bulk_replace.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/cache_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/cache_temporal_4265.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/case.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/cast.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/change_user.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/change_user_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/charset_client_win.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/check.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/check_constraint.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/check_constraint_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/check_constraint_show.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/cli_options_force_protocol_not_win.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/cli_options_force_protocol_win.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/client_xml.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/column_compression.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/column_compression_parts.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/column_compression_rpl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/column_compression_utf16.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/comment_column.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/comment_column2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/comment_database.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/comment_index.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/comment_table.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/comments.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/commit.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/commit_1innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/compare.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/compound.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/compress.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/concurrent_innodb_safelog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/concurrent_innodb_unsafelog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/connect-abstract.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/connect.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/connect2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/connect_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/consistent_snapshot.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/constraints.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/contributors.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/count_distinct.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/count_distinct2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/count_distinct3.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/crash_commit_before.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create-big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create-uca.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_delayed.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_db.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_event.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_function.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_index.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_procedure.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_role.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_server.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_trigger.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_udf.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_user.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_drop_view.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_not_windows.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_or_replace.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_or_replace2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_or_replace_permission.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_replace_tmp.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_select_tmp.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_user.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_utf8.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_w_max_indexes_128.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/create_w_max_indexes_64.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/cte_cycle.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/cte_grant.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/cte_nonrecursive.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/cte_nonrecursive_not_embedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/cte_recursive.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/cte_recursive_not_embedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_ascii.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_big5.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_binary.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_collate.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_cp1250_ch.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_cp1251.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_cp850.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_cp932.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_cp932_binlog_row.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_cp932_binlog_stm.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_create.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_dec8.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_errors.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_eucjpms.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_euckr.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_filename.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_filesystem.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_gb2312.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_gbk.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_gbk_binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_gbk_export_import.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_hebrew.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_latin1.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_latin1_de.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_latin2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_latin2_ch.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_ldml.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_like_range.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_many.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_mb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_nopad_8bit.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_partitions.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_recoding.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_sjis.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_swe7.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_tis620.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_uca.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_uca_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_uca_partitions.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_ucs.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_ucs2_def.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_ucs2_query_cache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_ucs2_uca.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_ujis.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_ujis_ucs2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_upgrade.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf16.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf16_def.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf16_uca.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf16le.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf32.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf32_def.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf32_uca.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf8.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf8_def_upgrade.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf8_uca.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf8mb4.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf8mb4_heap.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf8mb4_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf8mb4_myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ctype_utf8mb4_uca.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/custom_aggregate_functions.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/custom_aggregates_i_s.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/date_formats.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/datetime_456.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ddl_i18n_koi8r.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ddl_i18n_utf8.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/deadlock_ftwrl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/deadlock_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/debug_sync.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/default.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/default_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/default_session.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/default_storage_engine.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/delayed.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/delayed_blob.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/delete.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/delete_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/delete_returning.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/delete_returning_grant.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/delete_use_source.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/delimiter_command_case_sensitivity.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/deprecated_features.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/derived.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/derived_cond_pushdown.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/derived_opt.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/derived_split_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/derived_view.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/dirty_close.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/distinct.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/drop.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/drop_bad_db_type.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/drop_combinations.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/drop_table_force.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/dyncol.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/empty_server_name-8224.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/empty_string_literal.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/empty_table.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/empty_user_table.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/endspace.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/enforce_storage_engine.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/enforce_storage_engine_opt.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/engine_error_in_alter-8453.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/error_simulation.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/errors.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_1.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_bugs.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_embedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_grant.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_logs_tests.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_microsec.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_restart.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_scheduling.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_slowlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_stress.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_time_zone.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_trans.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/events_trans_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/except.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/except_all.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/execution_constants.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/explain.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/explain_json.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/explain_json_format_partitions.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/explain_json_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/explain_non_select.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/explain_slowquerylog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ext_key_noPK_6794.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/failed_auth_3909.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/failed_auth_unixsocket.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fast_prefix_index_fetch_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/features,ps.rdiff (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/features.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fetch_first.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/file_contents.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/filesort_bad_i_s-7585.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/filesort_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fix_priv_tables.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush-innodb-notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush-innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush_and_binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush_block_commit.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush_block_commit_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush_logs_not_windows.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush_read_lock.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush_read_lock_kill.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush_ssl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/flush_table.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/foreign_key.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/frm-debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/frm_bad_row_type-7333.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext3.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext_cache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext_charsets.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext_derived_4257.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext_derived_4316.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext_distinct.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext_left_join.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext_multi.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext_order_by.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext_update.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/fulltext_var.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_analyse.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_bit.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_compress.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_concat.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_crypt.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_date_add.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_default.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_des_encrypt.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_digest.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_encrypt.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_encrypt_nossl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_encrypt_ucs2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_equal.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_extract.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_gconcat.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_group.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_group_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_hybrid_type.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_if.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_in.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_int.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_isnull.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_json.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_like.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_math.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_misc.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_op.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_regexp.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_regexp_pcre.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_regexp_pcre_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_rollback.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_sapdb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_set.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_str.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_system.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_test.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_time.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_time_hires.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_time_round.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_timestamp.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/func_weight_string.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/function_defaults.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/function_defaults_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/function_defaults_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/gcc296.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/get_diagnostics.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/gis-alter_table_online.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/gis-debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/gis-json.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/gis-loaddata.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/gis-precise.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/gis-rt-precise.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/gis-rtree.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/gis.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/gis_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant3.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant4.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant5.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_4332.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_binlog_replay.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_cache_no_prot.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_cache_ps_prot.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_explain_non_select.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_kill.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_lowercase.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_lowercase_fs.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_master_admin.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_not_windows.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_read_only.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_repair.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_server.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_slave_admin.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/grant_slave_monitor.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/greedy_optimizer.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/group_by.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/group_by_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/group_by_null.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/group_min_max.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/group_min_max_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/handler_read_last.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/handlersocket.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/having.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/having_cond_pushdown.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/help.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/host_cache_size_functionality.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/huge_frm-6224.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ignored_index.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ignored_index_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/implicit_char_to_num_conversion.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/implicit_commit.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/in_datetime_241.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/in_subq_cond_pushdown.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/index_intersect.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/index_intersect_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/index_merge_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/index_merge_myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema-big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema_all_engines.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema_chmod.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema_db.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema_inno.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema_linux.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema_parameters.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema_part.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema_prepare.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema_routines.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/information_schema_stats.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/init_connect.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/init_connection_query_cache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/init_file.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/init_file_longline_3816.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/init_file_set_password-7656.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_bug878769.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_ext_key,off.rdiff (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_ext_key.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_group.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_icp.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_icp_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_ignore_builtin.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_load_xa.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_mrr_cpk.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_mysql_lock.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_mysql_lock2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_mysql_sync.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/innodb_utf8.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/insert.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/insert_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/insert_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/insert_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/insert_returning.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/insert_returning_datatypes.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/insert_select.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/insert_update.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/insert_update_autoinc-7150.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/intersect.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/intersect_all.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/invisible_binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/invisible_field.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/invisible_field_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/invisible_field_grant_completely.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/invisible_field_grant_system.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/invisible_partition.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ipv4_and_ipv6.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ipv4_as_ipv6.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ipv6.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/join.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/join_cache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/join_crash.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/join_nested.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/join_nested_jcl6.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/join_optimizer.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/join_outer.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/join_outer_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/join_outer_jcl6.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/key.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/key_cache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/key_diff.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/key_primary.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/keyread.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/keywords.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/kill-2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/kill.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/kill_processlist-6619.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/kill_query-6728.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/large_pages.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/last_value.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/limit.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/limit_rows_examined.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/loaddata.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/loaddata_autocom_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/loadxml.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/locale.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lock.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lock_kill.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lock_multi.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lock_multi_bug38499.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lock_multi_bug38691.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lock_sync.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lock_tables_lost_commit.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lock_user.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lock_view.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/locked_temporary-5955.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/locking_clause.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/log_errchk.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/log_slow.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/log_slow_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/log_state.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/log_state_bug33693.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/log_tables-big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/log_tables.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/log_tables_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/log_tables_upgrade.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/long_host.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/long_tmpdir.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/long_unique.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/long_unique_bugs.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/long_unique_bugs_replication.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/long_unique_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/long_unique_delayed.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/long_unique_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/long_unique_update.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/long_unique_using_hash.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_fs_off.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_fs_on.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_mixed_tmpdir.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_mixed_tmpdir_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_table.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_table2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_table4.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_table5.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_table_grant.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_table_qcache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_utf8.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/lowercase_view.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/max_password_errors.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/max_statement_time.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mdev-21101.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mdev13607.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mdev19198.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mdev316.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mdev375.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mdev6830.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mdev_14586.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mdev_19276.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mdev_22370.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mdl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mdl_sync.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/merge-big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/merge.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/merge_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/merge_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/merge_mmap.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/metadata.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mix2_myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mix2_myisam_ucs2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mrr_derived_crash_4610.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mrr_icp_extra.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/multi_statement.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/multi_update.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/multi_update_big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/multi_update_binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/multi_update_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/multi_update_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/multi_update_tiny_hash.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/my_print_defaults.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam-big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam-blob.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam-optimize.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam-system.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam_crash_before_flush_keys.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam_enable_keys-10506.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam_explain_non_select_all.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam_icp.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam_icp_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam_icp_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam_mrr,32bit.rdiff (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam_mrr.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam_optimize.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisam_recover.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/myisampack.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql-bug41486.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql-bug45236.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql-metadata.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql5613mysql.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql57_virtual.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_binary_mode.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_binary_zero_insert.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_client_test.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_client_test_comp.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_client_test_nonblock.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_comments.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_cp932.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_embedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_install_db_win.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_json_mysql_upgrade.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_json_mysql_upgrade_with_plugin_loaded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_json_table_recreate.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_locale_posix.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_not_windows.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_protocols.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_tzinfo_to_sql_symlink.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_upgrade-20228.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_upgrade-6984.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_upgrade.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_upgrade_mysql_json_datatype.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_upgrade_no_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_upgrade_noengine.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_upgrade_ssl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_upgrade_to_100502.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysql_upgrade_view.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqladmin.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqlbinlog-innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqlbinlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqlbinlog_raw_mode.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqlbinlog_row_big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqlbinlog_row_compressed.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqlbinlog_row_minimal.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqlbinlog_stmt_compressed.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqlcheck.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqld--defaults-file.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqld--help,aix.rdiff (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqld--help,win.rdiff (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqld--help-aria.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqld--help.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqld_help_crash-9183.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqld_option_err.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqldump-compat-102.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqldump-compat.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqldump-max.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqldump-nl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqldump-no-binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqldump-system,win.rdiff (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqldump-system.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqldump-utf8mb4.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqldump.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqldump_restore.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqlhotcopy_myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqlshow.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqlslap.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqltest.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqltest_256.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqltest_cont_on_error.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqltest_ps.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/mysqltest_tracking_info.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/named_pipe.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/negation_elimination.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/nested_profiling.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/no-threads.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/no_binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/non_blocking_api.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/not_embedded_server.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/not_partition.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/null.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/null_key.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/odbc.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/olap.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/old-mode.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/openssl_1.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/openssl_6975,tlsv10.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/openssl_6975,tlsv12.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/opt_trace,ps.rdiff (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/opt_trace.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/opt_trace_index_merge.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/opt_trace_index_merge_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/opt_trace_security.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/opt_trace_ucs2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/opt_tvc.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/order_by-mdev-10122.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/order_by.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/order_by_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/order_by_optimizer.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/order_by_optimizer_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/order_by_pack_big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/order_by_sortkey.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/order_by_zerolength-4285.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/order_fill_sortbuf.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/outfile.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/outfile_loaddata.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/overflow.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/packet.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/parser.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/parser_bug21114_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/parser_not_embedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/parser_stack.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_alter.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_binlog_stmt.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_blackhole.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_bug18198.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_cache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_cache_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_cache_myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_charset.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_column.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_column_prune.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_csv.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_datatype.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_debug_sync.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_default.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_disabled.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_error.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_example.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_exchange.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_explicit_prune.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_grant.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_hash.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_innodb_plugin.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_innodb_semi_consistent.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_innodb_stmt.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_key_cache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_list.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_mgm.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_mgm_err.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_mgm_err2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_mrr_aria.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_mrr_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_mrr_myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_not_blackhole.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_not_windows.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_open_files_limit.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_order.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_pruning.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_range.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_rename_longfilename.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_symlink.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_sync.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_truncate.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_ucs2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_utf8-debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_utf8.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/partition_windows.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/password_expiration.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/password_expiration_unix_socket.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/percona_nonflushing_analyze_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/perror-win.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/perror.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_auth.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_auth_qa.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_auth_qa_1.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_auth_qa_2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_auth_qa_3.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_load.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_load_option.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_loaderr.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_maturity.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_not_embedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/plugin_vars.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/pool_of_threads.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/precedence.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/precedence_bugs.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/preload.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/prepare.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/processlist.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/processlist_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/profiling.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/progress_976225.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_10nestset.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_11bugs.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_1general.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_2myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_3innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_4heap.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_5merge.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_change_master.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_ddl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_ddl1.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_error.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_grant.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_max_subselect-5113.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_missed_cmds.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_missed_cmds_bin_prot.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_missed_cmds_bin_prot_not_embedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_missed_cmds_not_embedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_not_windows.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_qc_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ps_show_log.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/query_cache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/query_cache_28249.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/query_cache_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/query_cache_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/query_cache_merge.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/query_cache_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/query_cache_ps_no_prot.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/query_cache_ps_ps_prot.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/query_cache_with_views.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/quick_select_4161.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/range.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/range_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/range_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/range_interrupted-13751.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/range_mrr_icp.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/range_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/range_vs_index_merge.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/range_vs_index_merge_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/read_many_rows_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/read_only.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/read_only_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/rename.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/renamedb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/reopen_temp_table.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/repair.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/repair_symlink-5543.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/replace.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/replace_returning.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/replace_returning_datatypes.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/replace_returning_err.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/require_secure_transport.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/reset_connection.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/rollback.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/round.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/row-checksum-old.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/row-checksum.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/row.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/rowid_filter.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/rowid_filter_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/rowid_filter_innodb_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/rowid_filter_myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/rowid_filter_myisam_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/rowid_order_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/rownum.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/rpl_mysql_upgrade_slave_repo_check.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/rpl_mysqldump_slave.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/schema.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/second_frac-9175.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/secure_file_priv_win.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/select.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/select_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/select_found.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/select_jcl6.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/select_pkeycache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/select_safe.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/selectivity.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/selectivity_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/selectivity_no_engine.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/servers.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/session_tracker_last_gtid.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/set_operation.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/set_operation_oracle.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/set_password.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/set_statement.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/set_statement_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/set_statement_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/set_statement_notembedded_binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/set_statement_profiling.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/show.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/show_bad_definer-5553.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/show_check.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/show_create_user.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/show_explain.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/show_explain_non_select.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/show_explain_ps.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/show_function_with_pad_char_to_full_length.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/show_profile.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/show_row_order-9226.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/shutdown.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/shutdown_not_windows.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sighup-6580.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/signal.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/signal_code.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/signal_demo1.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/signal_demo2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/signal_demo3.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/signal_sqlmode.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/simultaneous_assignment.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/single_delete_update.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/single_delete_update_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/skip_grants.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/skip_log_bin.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/skip_name_resolve.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/slowlog_enospace-10508.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-anchor-row-type-cursor.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-anchor-row-type-table.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-anchor-type.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-bugs.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-bugs2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-code.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-condition-handler.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-cursor.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-destruct.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-dynamic.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-error.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-expr.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-fib.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-for-loop.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-group.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-lock.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-no-code.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-no-valgrind.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-prelocking.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-row.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-security-anchor-type.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-security.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-threads.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-ucs2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp-vars.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp_gis.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp_missing_4665.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp_stress_case.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp_sync.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp_trans.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sp_trans_log.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sql_mode.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sql_safe_updates.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl-big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_7937,nossl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_7937.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_8k_key.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_and_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_ca.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_cipher.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_compress.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_connect.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_crl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_crl_clients.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_system_ca,bad.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_system_ca.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_timeout-9836.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_timeout.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/ssl_verify_ip.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stack-crash.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables-enospc.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables_disabled.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables_innodb_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables_missing.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables_myisam_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables_par.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables_par_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables_partition.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables_rbr.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/stat_tables_repl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/statement-expr.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/statistics.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/statistics_close.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/statistics_index_crash-7362.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/status.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/status2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/status_bug17954.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/str_to_datetime_457.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/strict.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/strict_autoinc_1myisam.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/strict_autoinc_2innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/strict_autoinc_3heap.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/strings.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect-crash_15755.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect3.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect3_jcl6.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect4.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_cache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_exists2in.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_exists2in_costmat.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_extra.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_extra_no_semijoin.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_gis.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_mat.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_mat_cost.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_mat_cost_bugs.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_no_exists_to_in.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_no_mat.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_no_opts.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_no_scache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_no_semijoin.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_nulls.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_partial_match.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_sj.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_sj2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_sj2_jcl6.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_sj2_mat.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_sj_aria.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_sj_jcl6.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_sj_mat.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/subselect_sj_nonmerged.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sum_distinct-big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sum_distinct.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/symlink-aria-11902.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/symlink-myisam-11902.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/symlink.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/synchronization.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/sysdate_is_now.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/system_mysql_db.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/system_mysql_db_507.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/system_mysql_db_error_log.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/system_mysql_db_fix40123.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/system_mysql_db_fix50030.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/system_mysql_db_fix50117.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/system_mysql_db_refs.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/system_time_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/table_elim.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/table_elim_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/table_keyinfo-6838.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/table_options-5867.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/table_options.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/table_value_constr.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/tablelock.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/tablespace.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/tc_heuristic_recover.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/temp_table.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/temp_table_frm.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/temp_table_symlink.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/temporal_literal.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/temporal_scale_4283.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/thread_id_overflow.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/thread_pool_info.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/timeout.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/timezone.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/timezone2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/timezone3.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/timezone4.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/timezone_grant.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/tls_version.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/tls_version1.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/tmp_table_count-7586.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/trans_read_only.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/transaction_timeout.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/trigger-compat.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/trigger-trans.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/trigger.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/trigger_no_defaults-11698.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/trigger_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/trigger_null-8605.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/trigger_wl3253.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/truncate-stale-6500.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/truncate.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/truncate_badse.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/truncate_coverage.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/truncate_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_binary.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_bit.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_bit_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_blob.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_date.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_date_round.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_datetime.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_datetime_hires.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_datetime_round.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_decimal.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_enum.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_float.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_hex_hybrid.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_int.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_interval.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_json.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_nchar.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_newdecimal-big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_newdecimal.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_num.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_num_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_ranges.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_row.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_set.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_temporal_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_temporal_mariadb53.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_temporal_mysql56.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_temporal_mysql56_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_time.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_time_6065.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_time_hires.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_time_round.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_timestamp.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_timestamp_hires.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_timestamp_round.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_uint.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_varchar.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_varchar_mysql41.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/type_year.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/udf.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/udf_debug_sync.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/udf_notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/udf_query_cache.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/udf_skip_grants.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/union.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/union_crash-714.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/unique.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/unsafe_binlog_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/update.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/update_ignore_216.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/update_innodb.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/update_use_source.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/upgrade.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/upgrade_MDEV-19650.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/upgrade_MDEV-23102-1.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/upgrade_MDEV-23102-2.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/upgrade_mdev_24363.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/user_limits.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/user_var-binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/user_var.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/userstat-badlogin-4824.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/userstat.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/varbinary.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/variables-notembedded.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/variables.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/variables_community.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/view.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/view_alias.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/view_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/view_grant.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/wait_timeout.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/warnings.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/warnings_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/warnings_engine_disabled.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_as_arg_to_aggregate_func.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_avg.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_big-mdev-10092.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_big-mdev-11697.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_big.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_bit.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_empty_over.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_first_last_value.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_i_s.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_insert_select.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_lead_lag.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_min_max.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_nth_value.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_ntile.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_orderby.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_percent_cume.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_percentile.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_rank.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_std.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/win_sum.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/windows.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/windows_debug.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/wolfssl.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/xa.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/xa_binlog.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/xa_prepared_binlog_off.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/xa_sync.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/xml.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/r/xtradb_mrr.result (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/1st.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/aborted_clients.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/adddate_454.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alias.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/almost_full.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_events.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_table-big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_table.combinations (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_table.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_table_autoinc-5574.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_table_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_table_errors.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_table_mdev539_maria.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_table_mdev539_myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_table_online.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_table_trans.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/alter_user.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/analyze.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/analyze_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/analyze_format_json.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/analyze_stmt.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/analyze_stmt_orderby.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/analyze_stmt_privileges.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/analyze_stmt_privileges2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/analyze_stmt_slow_query_log-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/analyze_stmt_slow_query_log.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ansi.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/aria_icp_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/assign_key_cache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/assign_key_cache_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/auth_named_pipe-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/auth_named_pipe.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/auth_rpl-slave.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/auth_rpl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/auto_increment.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/auto_increment_ranges.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/auto_increment_ranges_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/auto_increment_ranges_myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/backup_aria.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/backup_interaction.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/backup_lock.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/backup_lock_binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/backup_lock_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/backup_locks.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/backup_log.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/backup_log.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/backup_priv.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/backup_stages.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/backup_syntax.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bad_frm_crash_5029.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bench_count_distinct.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bigint.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/binary.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/binary_to_hex.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bind_address_resolution.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bind_address_resolution.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/blackhole.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/blackhole_plugin.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bool.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bootstrap-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bootstrap.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bootstrap_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/brackets.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bug12427262.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bug13633383.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bug39022.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bug39022.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bug46760-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bug46760.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bug47671-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bug47671.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bug58669-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bug58669.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/bulk_replace.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cache_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cache_temporal_4265.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/case.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cast.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/change_user.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/change_user_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/charset_client_win.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/check.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/check_constraint.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/check_constraint_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/check_constraint_show.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cli_options_force_protocol_not_win.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cli_options_force_protocol_win.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cli_options_force_protocol_win.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/client_xml.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/column_compression.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/column_compression.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/column_compression_parts.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/column_compression_rpl.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/column_compression_rpl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/column_compression_utf16.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/comment_column.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/comment_column2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/comment_database.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/comment_index.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/comment_table.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/comments.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/commit.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/commit.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/commit_1innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/compare.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/compound.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/compress.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/concurrent_innodb_safelog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/concurrent_innodb_unsafelog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/connect-abstract.cnf (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/connect-abstract.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/connect.cnf (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/connect.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/connect2.cnf (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/connect2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/connect_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/consistent_snapshot.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/consistent_snapshot.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/constraints.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/contributors.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/count_distinct.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/count_distinct2-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/count_distinct2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/count_distinct3.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/crash_commit_before-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/crash_commit_before.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create-big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create-uca.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_delayed.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_db.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_event.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_function.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_index.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_procedure.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_role.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_server.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_trigger.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_udf.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_user.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_drop_view.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_not_windows.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_or_replace-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_or_replace.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_or_replace2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_or_replace_permission.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_replace_tmp.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_select_tmp.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_user.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_utf8.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_w_max_indexes_128.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/create_w_max_indexes_64.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cte_cycle.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cte_grant.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cte_nonrecursive.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cte_nonrecursive_not_embedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cte_recursive.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/cte_recursive_not_embedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_ascii.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_big5.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_binary.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_collate.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_cp1250_ch.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_cp1251.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_cp850.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_cp932.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_cp932_binlog_row.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_cp932_binlog_stm.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_create.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_dec8.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_errors.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_eucjpms.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_euckr.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_filename.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_filesystem-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_filesystem.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_gb2312.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_gbk.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_gbk_binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_gbk_export_import.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_hebrew.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_latin1.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_latin1_de.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_latin2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_latin2_ch.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_ldml-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_ldml.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_like_range.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_many.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_mb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_nopad_8bit.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_partitions.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_recoding.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_sjis.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_swe7.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_tis620.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_uca.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_uca_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_uca_partitions.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_ucs.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_ucs2_def-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_ucs2_def.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_ucs2_query_cache-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_ucs2_query_cache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_ucs2_uca.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_ujis.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_ujis_ucs2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_upgrade.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf16.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf16_def-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf16_def.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf16_uca.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf16le.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf32.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf32_def.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf32_def.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf32_uca.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8_def_upgrade.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8_def_upgrade.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8_uca.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8mb4-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8mb4.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8mb4_heap.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8mb4_innodb-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8mb4_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8mb4_myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ctype_utf8mb4_uca.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/custom_aggregate_functions.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/custom_aggregates_i_s.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/date_formats-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/date_formats.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/datetime_456.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ddl_i18n_koi8r.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ddl_i18n_utf8.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/deadlock_ftwrl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/deadlock_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/debug_sync.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/default.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/default_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/default_session.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/default_storage_engine.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/delayed.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/delayed_blob.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/delayed_blob.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/delete.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/delete_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/delete_returning.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/delete_returning_grant.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/delete_use_source.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/delimiter_case_mdev_10728.sql (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/delimiter_command_case_sensitivity.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/deprecated_features.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/derived.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/derived_cond_pushdown.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/derived_opt.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/derived_split_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/derived_view.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/dirty_close.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/distinct.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/drop.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/drop_bad_db_type.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/drop_combinations.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/drop_combinations.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/drop_table_force.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/dyncol.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/empty_server_name-8224.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/empty_string_literal.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/empty_table.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/empty_user_table.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/endspace.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/enforce_storage_engine.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/enforce_storage_engine_opt.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/enforce_storage_engine_opt.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/engine_error_in_alter-8453.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/error_simulation-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/error_simulation.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/errors.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_1.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_bugs-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_bugs.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_embedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_grant.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_logs_tests-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_logs_tests.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_microsec.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_restart-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_restart.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_scheduling.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_slowlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_stress.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_time_zone.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_trans.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/events_trans_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/except.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/except_all.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/execution_constants.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/explain.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/explain_json.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/explain_json_format_partitions.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/explain_json_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/explain_non_select.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/explain_slowquerylog-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/explain_slowquerylog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ext_key_noPK_6794.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/failed_auth_3909.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/failed_auth_unixsocket.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fast_prefix_index_fetch_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/features.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fetch_first.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/file_contents.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/filesort_bad_i_s-7585.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/filesort_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fix_priv_tables.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush-innodb-notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush-innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush2-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush_and_binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush_block_commit.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush_block_commit_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush_logs_not_windows.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush_read_lock.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush_read_lock_kill.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush_ssl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/flush_table.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/foreign_key.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/frm-debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/frm_bad_row_type-7333.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext3.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext_cache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext_charsets.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext_derived_4257.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext_derived_4316.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext_distinct.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext_left_join.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext_multi.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext_order_by.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext_update.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/fulltext_var.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_analyse.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_bit.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_compress.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_concat.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_crypt.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_date_add.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_default.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_des_encrypt.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_digest.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_encrypt-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_encrypt.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_encrypt_nossl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_encrypt_ucs2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_equal.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_extract.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_gconcat.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_group.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_group_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_hybrid_type.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_if.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_in.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_int.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_isnull.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_json.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_like.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_math.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_misc.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_op.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_regexp.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_regexp_pcre.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_regexp_pcre_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_rollback.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_sapdb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_set.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_str.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_system.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_test.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_time.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_time_hires.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_time_round.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_timestamp.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/func_weight_string.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/function_defaults.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/function_defaults_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/function_defaults_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/gcc296.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/get_diagnostics.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/gis-alter_table_online.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/gis-debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/gis-json.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/gis-loaddata.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/gis-precise.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/gis-rt-precise.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/gis-rtree.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/gis.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/gis_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant2.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant3-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant3.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant4.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant4.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant5.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_4332.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_binlog_replay.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_cache_no_prot.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_cache_ps_prot.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_explain_non_select.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_kill.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_lowercase.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_lowercase.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_lowercase_fs.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_master_admin.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_not_windows.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_read_only.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_repair.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_server.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_slave_admin.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/grant_slave_monitor.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/greedy_optimizer.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/group_by.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/group_by_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/group_by_null.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/group_min_max.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/group_min_max_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/handler_read_last.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/handlersocket.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/handlersocket.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/having.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/having_cond_pushdown.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/help.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/host_cache_size_functionality.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/huge_frm-6224.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ignored_index.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ignored_index_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/implicit_char_to_num_conversion.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/implicit_commit-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/implicit_commit.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/in_datetime_241.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/in_subq_cond_pushdown.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/index_intersect.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/index_intersect_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/index_merge_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/index_merge_myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema-big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema_all_engines-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema_all_engines.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema_chmod.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema_db.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema_inno.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema_linux.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema_parameters.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema_part.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema_prepare.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema_routines.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/information_schema_stats.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/init_connect-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/init_connect.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/init_connection_query_cache-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/init_connection_query_cache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/init_file.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/init_file.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/init_file_longline_3816.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/init_file_longline_3816.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/init_file_set_password-7656.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_bug878769.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_ext_key.combinations (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_ext_key.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_group.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_icp.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_icp_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_ignore_builtin-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_ignore_builtin.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_load_xa.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_load_xa.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_mrr_cpk.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_mysql_lock.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_mysql_lock2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_mysql_sync.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/innodb_utf8.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/insert.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/insert_debug-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/insert_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/insert_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/insert_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/insert_returning.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/insert_returning_datatypes.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/insert_select.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/insert_update.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/insert_update_autoinc-7150.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/intersect.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/intersect_all.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/invisible_binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/invisible_field.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/invisible_field_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/invisible_field_grant_completely.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/invisible_field_grant_system.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/invisible_partition.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ipv4_and_ipv6.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ipv4_and_ipv6.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ipv4_as_ipv6-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ipv4_as_ipv6.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ipv6-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ipv6.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/join.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/join_cache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/join_crash.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/join_nested.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/join_nested_jcl6.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/join_optimizer.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/join_outer.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/join_outer_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/join_outer_jcl6.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/key.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/key_cache-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/key_cache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/key_diff.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/key_primary.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/keyread.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/keywords.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/kill-2-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/kill-2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/kill.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/kill_processlist-6619.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/kill_query-6728.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/large_pages.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/large_pages.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/last_value.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/limit.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/limit_rows_examined.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/loaddata.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/loaddata_autocom_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/loadxml.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/locale.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/locale.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lock.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lock_kill.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lock_multi.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lock_multi_bug38499.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lock_multi_bug38691.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lock_sync-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lock_sync.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lock_tables_lost_commit-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lock_tables_lost_commit.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lock_user.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lock_view.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/locked_temporary-5955.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/locking_clause.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_errchk.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_slow.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_slow_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_state-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_state.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_state_bug33693-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_state_bug33693.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_tables-big-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_tables-big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_tables-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_tables.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_tables_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/log_tables_upgrade.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_host.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_tmpdir-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_tmpdir-master.sh (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_tmpdir.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_unique.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_unique_bugs.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_unique_bugs_replication.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_unique_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_unique_delayed.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_unique_innodb.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_unique_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_unique_update.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/long_unique_using_hash.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_fs_off.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_fs_on.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_mixed_tmpdir-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_mixed_tmpdir-master.sh (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_mixed_tmpdir.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_mixed_tmpdir_innodb-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_mixed_tmpdir_innodb-master.sh (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_mixed_tmpdir_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_table-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_table.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_table2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_table4-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_table4.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_table5.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_table_grant-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_table_grant.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_table_qcache-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_table_qcache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_utf8-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_utf8.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_view-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/lowercase_view.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/max_password_errors.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/max_statement_time.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdev-21101.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdev-21101.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdev13607.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdev19198.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdev316.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdev375.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdev6830.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdev_14586.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdev_19276.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdev_22370.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdl_sync-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mdl_sync.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/merge-big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/merge.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/merge_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/merge_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/merge_mmap-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/merge_mmap.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/metadata.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mix2_myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mix2_myisam_ucs2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mrr_derived_crash_4610.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mrr_icp_extra.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/multi_statement-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/multi_statement.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/multi_update-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/multi_update.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/multi_update_big.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/multi_update_big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/multi_update_binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/multi_update_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/multi_update_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/multi_update_tiny_hash-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/multi_update_tiny_hash.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/my_print_defaults.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam-big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam-blob-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam-blob.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam-optimize.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam-system.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_crash_before_flush_keys-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_crash_before_flush_keys.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_enable_keys-10506.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_explain_non_select_all.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_icp.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_icp_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_icp_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_mrr.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_optimize.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_recover-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisam_recover.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/myisampack.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql-bug41486.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql-bug45236.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql-metadata.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql5613mysql.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql57_virtual.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_binary_mode.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_binary_zero_insert.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_client_test-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_client_test.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_client_test_comp-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_client_test_comp.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_client_test_nonblock-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_client_test_nonblock.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_comments.sql (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_comments.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_cp932.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_delimiter.sql (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_delimiter_19799.sql (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_delimiter_source.sql (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_embedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_install_db_win.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_json_mysql_upgrade.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_json_mysql_upgrade_with_plugin_loaded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_json_table_recreate.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_json_table_recreate.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_locale_posix.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_not_windows.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_protocols.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_tzinfo_to_sql_symlink.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_upgrade-20228.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_upgrade-6984.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_upgrade-6984.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_upgrade.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_upgrade_mysql_json_datatype.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_upgrade_no_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_upgrade_noengine.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_upgrade_ssl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_upgrade_to_100502.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysql_upgrade_view.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqladmin.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlbinlog-innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlbinlog-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlbinlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlbinlog_raw_mode.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlbinlog_row_big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlbinlog_row_compressed.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlbinlog_row_minimal.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlbinlog_row_minimal.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlbinlog_stmt_compressed.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlcheck-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlcheck.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlcheck.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqld--defaults-file.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqld--help-aria.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqld--help.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqld_help_crash-9183.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqld_option_err.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump-compat-102.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump-compat-102.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump-compat.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump-compat.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump-max-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump-max.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump-nl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump-no-binlog-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump-no-binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump-system.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump-utf8mb4.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqldump_restore.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlhotcopy_myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlshow.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlslap.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqlslap.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqltest.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqltest_256.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqltest_cont_on_error.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqltest_ps.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/mysqltest_tracking_info.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/named_pipe-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/named_pipe.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/negation_elimination.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/nested_profiling.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/no-threads-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/no-threads.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/no_binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/non_blocking_api.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/not_embedded_server.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/not_partition.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/null.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/null_key.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/odbc.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/olap.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/old-mode-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/old-mode.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/openssl_1.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/openssl_6975.combinations (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/openssl_6975.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/opt_trace.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/opt_trace_index_merge.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/opt_trace_index_merge_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/opt_trace_security.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/opt_trace_ucs2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/opt_tvc.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/order_by-mdev-10122.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/order_by.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/order_by_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/order_by_optimizer.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/order_by_optimizer_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/order_by_pack_big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/order_by_sortkey.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/order_by_zerolength-4285.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/order_fill_sortbuf.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/outfile.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/outfile_loaddata.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/overflow.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/packet.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/parser.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/parser_bug21114_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/parser_not_embedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/parser_stack.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_alter.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_binlog_stmt.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_blackhole.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_bug18198.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_cache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_cache_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_cache_myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_charset.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_column.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_column_prune.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_csv.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_datatype.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_debug_sync.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_default.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_disabled-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_disabled.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_error.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_example.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_example.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_exchange-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_exchange.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_explicit_prune.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_grant.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_hash.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_innodb_plugin.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_innodb_semi_consistent-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_innodb_semi_consistent.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_innodb_stmt.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_key_cache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_list.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_mgm.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_mgm_err.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_mgm_err2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_mrr_aria.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_mrr_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_mrr_myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_not_blackhole-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_not_blackhole.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_not_windows-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_not_windows.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_open_files_limit-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_open_files_limit.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_order.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_pruning.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_range.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_rename_longfilename.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_symlink.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_sync.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_truncate.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_ucs2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_utf8-debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_utf8.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/partition_windows.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/password_expiration.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/password_expiration_unix_socket.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/percona_nonflushing_analyze_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/perror-win.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/perror.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_auth.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_auth_qa.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_auth_qa_1.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_auth_qa_2-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_auth_qa_2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_auth_qa_3-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_auth_qa_3.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_innodb.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_load.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_load.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_load_option.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_load_option.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_loaderr.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_loaderr.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_maturity-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_maturity.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_not_embedded.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_not_embedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/plugin_vars.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/pool_of_threads.cnf (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/pool_of_threads.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/precedence.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/precedence_bugs.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/preload.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/prepare.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/processlist.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/processlist_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/profiling.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/progress_976225.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_10nestset.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_11bugs.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_1general.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_2myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_3innodb-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_3innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_4heap.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_5merge.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_change_master.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_ddl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_ddl1.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_error.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_grant.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_max_subselect-5113.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_missed_cmds.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_missed_cmds_bin_prot.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_missed_cmds_bin_prot_not_embedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_missed_cmds_not_embedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_not_windows.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_qc_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ps_show_log.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/query_cache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/query_cache_28249.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/query_cache_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/query_cache_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/query_cache_merge.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/query_cache_notembedded-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/query_cache_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/query_cache_ps_no_prot.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/query_cache_ps_ps_prot.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/query_cache_with_views.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/quick_select_4161.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/range.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/range_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/range_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/range_interrupted-13751.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/range_mrr_icp.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/range_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/range_vs_index_merge.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/range_vs_index_merge_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/read_many_rows_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/read_only.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/read_only_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/rename.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/renamedb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/reopen_temp_table.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/repair.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/repair_symlink-5543.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/replace.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/replace_returning.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/replace_returning_datatypes.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/replace_returning_err.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/require_secure_transport-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/require_secure_transport.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/reset_connection.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/rollback.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/round.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/row-checksum-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/row-checksum-old-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/row-checksum-old.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/row-checksum.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/row-checksum.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/row.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/rowid_filter.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/rowid_filter_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/rowid_filter_innodb_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/rowid_filter_myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/rowid_filter_myisam_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/rowid_order_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/rownum.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/rpl_mysql_upgrade_slave_repo_check.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/rpl_mysqldump_slave.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/schema.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/second_frac-9175.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/secure_file_priv_win-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/secure_file_priv_win.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/select.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/select_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/select_found.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/select_jcl6.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/select_pkeycache-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/select_pkeycache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/select_safe.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/selectivity.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/selectivity.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/selectivity_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/selectivity_no_engine.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/servers.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/session_tracker_last_gtid.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/set_operation.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/set_operation_oracle.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/set_password.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/set_statement.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/set_statement_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/set_statement_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/set_statement_notembedded_binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/set_statement_profiling.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_bad_definer-5553.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_check-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_check.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_create_user.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_explain.cc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_explain.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_explain.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_explain_non_select.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_explain_ps.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_function_with_pad_char_to_full_length.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_profile.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/show_row_order-9226.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/shutdown.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/shutdown_not_windows.combinations (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/shutdown_not_windows.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sighup-6580.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/signal.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/signal_code.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/signal_demo1.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/signal_demo2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/signal_demo3.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/signal_sqlmode.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/simultaneous_assignment.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/single_delete_update.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/single_delete_update_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/skip_grants.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/skip_grants.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/skip_log_bin-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/skip_log_bin.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/skip_name_resolve-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/skip_name_resolve.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/slowlog_enospace-10508.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-anchor-row-type-cursor.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-anchor-row-type-table.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-anchor-type.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-bugs.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-bugs2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-code.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-condition-handler.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-cursor.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-destruct.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-dynamic.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-error.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-expr.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-fib.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-for-loop.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-group.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-lock.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-no-code.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-no-valgrind.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-prelocking.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-row-vs-var.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-row.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-security-anchor-type.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-security.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-threads.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-ucs2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp-vars.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp_gis.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp_missing_4665.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp_notembedded.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp_stress_case.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp_sync.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp_trans.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sp_trans_log.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sql_mode.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sql_safe_updates.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sql_safe_updates.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl-big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_7937.combinations (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_7937.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_8k_key-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_8k_key.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_and_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_ca.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_cipher.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_cipher.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_compress.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_connect.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_crl.combinations (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_crl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_crl_clients.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_system_ca.combinations (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_system_ca.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_timeout-9836.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_timeout-9836.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_timeout.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_verify_ip.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/ssl_verify_ip.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stack-crash.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables-enospc.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables_disabled.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables_innodb_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables_missing.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables_myisam_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables_par.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables_par.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables_par_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables_partition.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables_rbr.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/stat_tables_repl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/statement-expr.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/statistics.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/statistics_close.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/statistics_index_crash-7362.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/status-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/status.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/status2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/status_bug17954.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/str_to_datetime_457.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/strict-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/strict.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/strict_autoinc_1myisam.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/strict_autoinc_2innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/strict_autoinc_3heap.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/strings.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect-crash_15755.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect3.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect3.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect3_jcl6.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect4.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_cache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_exists2in.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_exists2in_costmat.cnf (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_exists2in_costmat.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_extra.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_extra_no_semijoin.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_gis.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_mat.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_mat_cost-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_mat_cost.cnf (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_mat_cost.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_mat_cost_bugs.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_no_exists_to_in.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_no_mat.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_no_opts.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_no_scache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_no_semijoin.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_nulls.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_partial_match.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_sj.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_sj2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_sj2_jcl6.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_sj2_mat.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_sj_aria.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_sj_jcl6.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_sj_mat.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/subselect_sj_nonmerged.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sum_distinct-big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sum_distinct.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/symlink-aria-11902.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/symlink-myisam-11902.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/symlink.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/synchronization.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sysdate_is_now-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/sysdate_is_now.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/system_mysql_db.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/system_mysql_db_507.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/system_mysql_db_error_log-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/system_mysql_db_error_log.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/system_mysql_db_fix40123.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/system_mysql_db_fix50030.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/system_mysql_db_fix50117.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/system_mysql_db_refs.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/system_time_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/table_elim.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/table_elim_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/table_keyinfo-6838.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/table_options-5867.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/table_options-5867.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/table_options.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/table_value_constr.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/tablelock.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/tablespace.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/tc_heuristic_recover.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/temp_table-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/temp_table.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/temp_table_frm.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/temp_table_symlink.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/temporal_literal.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/temporal_scale_4283.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/thread_id_overflow.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/thread_pool_info.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/thread_pool_info.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/timeout.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/timezone-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/timezone.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/timezone2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/timezone3-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/timezone3.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/timezone4-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/timezone4.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/timezone_grant.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/tls_version.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/tls_version.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/tls_version1.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/tls_version1.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/tmp_table_count-7586.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/trans_read_only-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/trans_read_only.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/transaction_timeout.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/trigger-compat.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/trigger-trans.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/trigger.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/trigger_no_defaults-11698.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/trigger_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/trigger_null-8605.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/trigger_wl3253.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/truncate-stale-6500.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/truncate.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/truncate_badse.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/truncate_badse.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/truncate_coverage.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/truncate_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_binary.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_bit.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_bit_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_blob.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_date.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_date_round.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_datetime.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_datetime_hires.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_datetime_round.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_decimal.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_enum.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_float.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_hex_hybrid.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_int.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_interval.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_json.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_nchar.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_newdecimal-big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_newdecimal.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_num.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_num_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_ranges.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_row.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_set.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_temporal_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_temporal_mariadb53.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_temporal_mysql56.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_temporal_mysql56_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_time.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_time_6065.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_time_hires.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_time_round.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_timestamp.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_timestamp_hires.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_timestamp_round.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_uint.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_varchar.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_varchar.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_varchar_mysql41.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/type_year.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/udf.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/udf_debug_sync.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/udf_notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/udf_query_cache.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/udf_skip_grants-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/udf_skip_grants.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/union-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/union.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/union_crash-714.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/unique.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/unsafe_binlog_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/update.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/update_ignore_216.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/update_innodb.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/update_use_source.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/upgrade.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/upgrade.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/upgrade_MDEV-19650.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/upgrade_MDEV-23102-1.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/upgrade_MDEV-23102-2.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/upgrade_mdev_24363.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/user_limits-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/user_limits.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/user_var-binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/user_var.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/userstat-badlogin-4824.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/userstat.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/userstat.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/varbinary.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/variables-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/variables-notembedded-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/variables-notembedded.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/variables.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/variables_community.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/view.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/view_alias.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/view_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/view_grant.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/wait_timeout.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/warnings-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/warnings.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/warnings_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/warnings_engine_disabled.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_as_arg_to_aggregate_func.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_avg.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_big-mdev-10092.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_big-mdev-11697.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_big.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_bit.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_empty_over.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_first_last_value.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_i_s.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_insert_select.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_lead_lag.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_min_max.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_nth_value.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_ntile.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_orderby.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_percent_cume.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_percentile.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_rank.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_std.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/win_sum.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/windows.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/windows_debug.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/wl4435_generated.inc (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/wolfssl.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/wolfssl.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/xa.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/xa_binlog.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/xa_prepared_binlog_off-master.opt (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/xa_prepared_binlog_off.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/xa_sync.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/xml.test (100%) rename storage/eloq/mysql-test/{mono_main => eloq_main}/t/xtradb_mrr.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/disabled.def (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/include/have_eloq.inc (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/include/have_hash_partition.inc (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/include/have_range_partition.inc (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/include/mono_connect.inc (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/include/mono_connection.inc (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/include/mono_init.inc (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/my.cnf (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/alter_schema_term_changed.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/alter_view.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/batch_pk_load.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/bug172.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/check_blocked_request.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/create_after_drop.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/create_drop_db.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/create_drop_function.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/create_drop_index.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/create_drop_procedure.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/create_drop_view.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/create_table_flush_kv_fail.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/fault_create_drop_index.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/fault_inject_for_upsert_1.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/fault_inject_for_upsert_2.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/fault_inject_for_upsert_3.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/fault_inject_for_upsert_table.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/fault_inject_term_neg_Execute.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/flush_privileges.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/improve_ckpt_flush_undo.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/improve_ckpt_flush_undo_sk1.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/improve_ckpt_flush_undo_sk2.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/init_tx_failure.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/m_scan_remainer_lock.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/mono_auto_increment.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/multi_dead_lock_check.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/multi_nodes.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/range_split.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/range_split_keycache.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/range_split_recovery.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/range_split_write_forward.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/read_pk_using_sk.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/recover_committed_tx.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/recover_timeout.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/recover_uncommitted_tx.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/temporary_table.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/tx_timeout.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/r/tx_timeout_on_remote_response.result (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/alter_schema_term_changed.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/alter_view.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/batch_pk_load.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/bug172.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/check_blocked_request.cnf (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/check_blocked_request.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/create_after_drop.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/create_drop_db.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/create_drop_function.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/create_drop_index.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/create_drop_procedure.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/create_drop_view.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/create_table_flush_kv_fail.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/fault_create_drop_index.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/fault_inject_for_upsert_1.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/fault_inject_for_upsert_2.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/fault_inject_for_upsert_3.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/fault_inject_for_upsert_table.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/fault_inject_term_neg_Execute.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/flush_privileges.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/improve_ckpt_flush_undo.cnf (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/improve_ckpt_flush_undo.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/improve_ckpt_flush_undo_sk1.cnf (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/improve_ckpt_flush_undo_sk1.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/improve_ckpt_flush_undo_sk2.cnf (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/improve_ckpt_flush_undo_sk2.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/init_tx_failure.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/m_scan_remainer_lock.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/mono_auto_increment.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/multi_dead_lock_check.cnf (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/multi_dead_lock_check.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/multi_nodes.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/range_split.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/range_split_keycache.cnf (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/range_split_keycache.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/range_split_recovery.cnf (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/range_split_recovery.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/range_split_write_forward.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/read_pk_using_sk.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/recover_committed_tx.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/recover_timeout.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/recover_uncommitted_tx.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/temporary_table.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/tx_timeout.cnf (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/tx_timeout.test (100%) rename storage/eloq/mysql-test/{mono_multi => eloq_multi}/t/tx_timeout_on_remote_response.test (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 2254164da4b..00000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,375 +0,0 @@ ---- -# This Gitlab-CI pipeline offers basic validation that a commit did not -# introduce easily detectable regressions. Builds run primairly on a new Fedora, -# which has all the latest upstream build dependencies and thus is the primary -# testing target, as eventually everything in Fedora becomes the next CentOS and -# Red Hat releases. -# -# In addition test building on CentOS 7 and 8 to ensure that the code base -# remains reasonably backwards compatible. -# -# This is now intentionally simple, to keep it fast and accurate with minimal -# false positive failures. If one wants to extend it, see debian/salsa-ci.yml -# for inspiration on more integration tests to run. -# -# Also make sure the pipeline stays within the bounds of what CI workers on -# Gitlab-CI are capable of executing, thus ensuring that any potential -# contributor can at any point in time fork to their own Gitlab account and -# start working towards meaningful contributions! -# -# NOTE TO MERGERS: Most of the contents in the Gitlab-CI configuration has been -# tailored for a specific release or MariaDB. As a general rule, do not merge -# changes in this file across MariaDB branches to avoid breaking the CI. Updates -# the Gitlab-CI pipeline are most of the time better done manually per major -# release branch. - -stages: - - build - - test - - Salsa-CI - -# Base image for builds and tests unless otherwise defined -# @TODO: Fedora 34 is latest, but fails to start on Gitlab.com with error "shell not found" -image: fedora:33 - -# Define common CMAKE_FLAGS for all builds. Skim down build by omitting all -# submodules (a commit in this repo does not affect their builds anyway) and -# many components that are otherwise slow to build. -variables: - CMAKE_FLAGS: "-DWITH_SSL=system -DPLUGIN_COLUMNSTORE=NO -DPLUGIN_ROCKSDB=NO -DPLUGIN_S3=NO -DPLUGIN_MROONGA=NO -DPLUGIN_CONNECT=NO -DPLUGIN_MROONGA=NO -DPLUGIN_TOKUDB=NO -DPLUGIN_PERFSCHEMA=NO -DWITH_WSREP=OFF" - # Major version dictates which branches share the same ccache. E.g. 10.6-abc - # and 10.6-xyz will have the same cache. - MARIADB_MAJOR_VERSION: "10.6" - # NOTE! Currently ccache is only used on the Centos8 build. As each job has - # sufficiently different environments they are unable to benefit from each - # other's ccaches. As each build generates about 1 GB of ccache, having - # multiple caches would quickly consume all free storage on Gitlab-CI and - # grind all builds to a halt. Also the network overhead of download/upload - # decreases the benefit of ccache in Gitlab-CI, and current cache:when and - # cache:policy are not flexible enough to have a system where the cache is - # uploaded only once a week and not on every build. Having ccache on at least - # one build still helps ensure that ccache compatibility is at least tested - # and if the Centos 8 build is always significantly faster than all other - # builds (e.g. on self-hosted Gitlab instances) then users would at least be - # able to discover it. - # - # Most steps don't need the source code, only artifacts - GIT_STRATEGY: none - # Hack to satisfy directory name length requirement by CPackRPM in CMake 3.x - # https://cmake.org/cmake/help/v3.7/module/CPackRPM.html#variable:CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX - GIT_CLONE_PATH: $CI_BUILDS_DIR/CPACK_BUILD_SOURCE_DIRS_LONG_NAME_REQUIREMENT - -# Define once, use many times -.rpm_listfiles: &rpm_listfiles - - | - echo "Generating rpmlist-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log ..." - for package in *.rpm - do - echo "$package" - rpm -qlpv "$package" | awk '{print $1 " " $3 "/" $4 " ." $9 " " $10 " " $11}' | sort -k 3 - echo "------------------------------------------------" - done >> ../rpmlist-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - # CPackRPM lists contents in build log, so no need to show the output of this, - # just store it as a build artifact that can be downloaded and diffed against - # other builds to detect which files where added/removed/moved - -fedora: - stage: build - variables: - GIT_STRATEGY: fetch - GIT_SUBMODULE_STRATEGY: normal - script: - - yum install -y yum-utils rpm-build openssl-devel graphviz - # Accelerate builds with unsafe disk access, as we can afford to loose the entire build anyway - - yum install -y https://github.com/stewartsmith/libeatmydata/releases/download/v129/libeatmydata-129-1.fc33.x86_64.rpm - # This repository does not have any .spec files, so install dependencies based on Fedora spec file - - yum-builddep -y mariadb-server - - mkdir builddir; cd builddir - - cmake -DRPM=$CI_JOB_NAME $CMAKE_FLAGS .. 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - cmake --graphviz=../dependencies.dot .. && dot -Tpng -o ../dependencies.png ../dependencies.dot - - eatmydata make package -j 2 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - # @TODO: Don't use -j without the limit of 2 on Gitlab.com as builds just - # get stuck when running multi-proc and out of memory, see https://jira.mariadb.org/browse/MDEV-25968 - - make test - # - make test-force # mysql-test-runner takes too long, run MTR in a separate job instead - - *rpm_listfiles - - mkdir ../rpm; mv *.rpm ../rpm - artifacts: - when: always # Must be able to see logs - paths: - - build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - rpmlist-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - rpm - - builddir/_CPack_Packages/Linux/RPM/SPECS/ - - dependencies.dot - - dependencies.png - -fedora-ninja: - stage: build - variables: - GIT_STRATEGY: fetch - GIT_SUBMODULE_STRATEGY: normal - script: - - yum install -y yum-utils rpm-build openssl-devel graphviz ninja-build - # Accelerate builds with unsafe disk access, as we can afford to loose the entire build anyway - - yum install -y https://github.com/stewartsmith/libeatmydata/releases/download/v129/libeatmydata-129-1.fc33.x86_64.rpm - # This repository does not have any .spec files, so install dependencies based on Fedora spec file - - yum-builddep -y mariadb-server - - mkdir builddir; cd builddir - - cmake -DRPM=generic $CMAKE_FLAGS -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G Ninja .. 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - ninja -t graph > ../dependencies.dot && dot -Tpng -o ../dependencies.png ../dependencies.dot - - eatmydata ninja package -j 2 --verbose 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - # @TODO: Unlike other builds, the Ninja builds using Gitlab.com runners don't get stuck, but they do get - # stuck on runners with more processors, see https://jira.mariadb.org/browse/MDEV-25968. - # Thus, use the same limitation on Ninja builds as well to ensure it never gets stuck due to this bug. - - ninja test - - *rpm_listfiles - - mkdir ../rpm; mv *.rpm ../rpm - artifacts: - when: always # Must be able to see logs - paths: - - build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - rpmlist-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - rpm - - builddir/_CPack_Packages/Linux/RPM/SPECS/ - - dependencies.dot - - dependencies.png - -fedora-clang: - stage: build - variables: - GIT_STRATEGY: fetch - GIT_SUBMODULE_STRATEGY: normal - script: - - yum install -y yum-utils rpm-build openssl-devel graphviz clang - # Accelerate builds with unsafe disk access, as we can afford to loose the entire build anyway - - yum install -y https://github.com/stewartsmith/libeatmydata/releases/download/v129/libeatmydata-129-1.fc33.x86_64.rpm - # This repository does not have any .spec files, so install dependencies based on Fedora spec file - - yum-builddep -y mariadb-server - - mkdir builddir; cd builddir - - export CXX=${CXX:-clang++} - - export CC=${CC:-clang} - - export CXX_FOR_BUILD=${CXX_FOR_BUILD:-clang++} - - export CC_FOR_BUILD=${CC_FOR_BUILD:-clang} - - export CFLAGS='-Wno-unused-command-line-argument' - - export CXXFLAGS='-Wno-unused-command-line-argument' - - cmake -DRPM=generic $CMAKE_FLAGS .. 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - cmake --graphviz=../dependencies.dot .. && dot -Tpng -o ../dependencies.png ../dependencies.dot - - eatmydata make package -j 2 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - # @TODO: Don't use -j without the limit of 2 on Gitlab.com as builds just - # get stuck when running multi-proc and out of memory, see https://jira.mariadb.org/browse/MDEV-25968 - - make test - # - make test-force # mysql-test-runner takes too long, run MTr in a separate job instead - - *rpm_listfiles - - mkdir ../rpm; mv *.rpm ../rpm - artifacts: - when: always # Must be able to see logs - paths: - - build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - rpmlist-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - rpm - - builddir/_CPack_Packages/Linux/RPM/SPECS/ - - dependencies.dot - - dependencies.png - -centos8: - stage: build - image: quay.io/centos/centos:stream8 # CentOS 8 is deprecated, use this Stream8 instead - variables: - GIT_STRATEGY: fetch - GIT_SUBMODULE_STRATEGY: normal - script: - - yum install -y yum-utils rpm-build openssl-devel pcre2-devel - - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm - # dnf --enablerepo=powertools install Judy-devel #--> not found - - dnf config-manager --set-enabled powertools - # Error: - # Problem: conflicting requests - # - package Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.i686 is filtered out by modular filtering - # - package Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64 is filtered out by modular filtering - # Solution: install Judy-devel directly from downloaded rpm file: - - yum install -y http://vault.centos.org/centos/8/PowerTools/x86_64/os/Packages/Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64.rpm - # Use eatmydata to speed up build - - yum install -y https://github.com/stewartsmith/libeatmydata/releases/download/v129/libeatmydata-129-1.fc33.x86_64.rpm - - yum install -y ccache # From EPEL - - source /etc/profile.d/ccache.sh - - export CCACHE_DIR="$(pwd)/.ccache"; ccache --zero-stats - # This repository does not have any .spec files, so install dependencies based on CentOS spec file - - yum-builddep -y mariadb-server - - mkdir builddir; cd builddir - - cmake -DRPM=$CI_JOB_NAME $CMAKE_FLAGS .. 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - eatmydata make package -j 2 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - # @TODO: Don't use -j without the limit of 2 on Gitlab.com as builds just - # get stuck when running multi-proc and out of memory, see https://jira.mariadb.org/browse/MDEV-25968 - - make test - # - make test-force # mysql-test-runner takes too long, run it MTR a separate job instead - - *rpm_listfiles - - mkdir ../rpm; mv *.rpm ../rpm - - ccache -s - artifacts: - when: always # Must be able to see logs - paths: - - build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - rpmlist-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - rpm - - builddir/_CPack_Packages/Linux/RPM/SPECS/ - cache: - key: $MARIADB_MAJOR_VERSION - paths: - - .ccache - -centos7: - stage: build - image: centos:7 - variables: - GIT_STRATEGY: fetch - GIT_SUBMODULE_STRATEGY: normal - script: - # This repository does not have any .spec files, so install dependencies based on Fedora spec file - - yum-builddep -y mariadb-server - # ..with a few extra ones, as CentOS 7 is very old and these are added in newer MariaDB releases - - yum install -y yum-utils rpm-build gcc gcc-c++ bison libxml2-devel libevent-devel openssl-devel pcre2-devel - - mkdir builddir; cd builddir - - cmake -DRPM=$CI_JOB_NAME $CMAKE_FLAGS .. 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - make package -j 2 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - # @TODO: Don't use -j without the limit of 2 on Gitlab.com as builds just - # get stuck when running multi-proc and out of memory, see https://jira.mariadb.org/browse/MDEV-25968 - - make test - # - make test-force # mysql-test-runner takes too long, run it in a separate job instead - - *rpm_listfiles - - mkdir ../rpm; mv *.rpm ../rpm - artifacts: - when: always # Must be able to see logs - paths: - - build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - rpmlist-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - - rpm - - builddir/_CPack_Packages/Linux/RPM/SPECS/ - -mysql-test-run: - stage: test - dependencies: - - fedora - script: - # Install packages so tests and the dependencies install - # @TODO: RPM missing 'patch' and 'diff' as dependency, so installing it manually for now - - yum install -y rpm/*.rpm patch diffutils - # @TODO: Fix on packaging level for /usr/share/mariadb to work and errormsg.sys be found - - rm -rf /usr/share/mariadb; ln -s /usr/share/mysql /usr/share/mariadb - # mtr expects to be launched in-place and with write access to it's own directories - - cd /usr/share/mysql-test - # Skip failing tests - - | - echo " - main.mysqldump : Field separator argument is not what is expected; check the manual when executing 'SELECT INTO OUTFILE' - main.flush_logs_not_windows : query 'flush logs' succeeded - should have failed with error ER_CANT_CREATE_FILE (1004) - main.mysql_upgrade_noengine : upgrade output order does not match the expected - " > skiplist - - ./mtr --suite=main --force --parallel=auto --xml-report=$CI_PROJECT_DIR/junit.xml --skip-test-list=skiplist - artifacts: - when: always # Also show results when tests fail - reports: - junit: - - junit.xml - -rpmlint: - stage: test - dependencies: - - fedora - script: - - yum install -y rpmlint - - rm -f rpm/*debuginfo* # Not relevant in this test - # Limit output to 1000 lines as Gitlab-CI max output is 4194304 bytes - # Save everything in a log file so it can be viewed in full via artifacts - - rpmlint --info rpm/*.rpm | tee -a rpmlint-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - artifacts: - when: always # Also show results when tests fail - paths: - - rpmlint-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log - allow_failure: true - # @TODO: The package is not rpmlint clean, must allow failure for now - -fedora install: - stage: test - dependencies: - - fedora - script: - - rm -f rpm/*debuginfo* # Not relevant in this test - # Nothing provides galera-4 on Fedora, so this step fails if built with wsrep - - yum install -y rpm/*.rpm - # Fedora does not support running services in Docker (like Debian packages do) so start it manually - - /usr/bin/mariadb-install-db -u mysql - - sudo -u mysql /usr/sbin/mariadbd & sleep 10 - # Dump database contents as is before upgrade - - mariadb-dump --all-databases --all-tablespaces --triggers --routines --events --skip-extended-insert > installed-database.sql - # Since we did a manual start, we also need to run upgrade manually - - /usr/bin/mariadb-upgrade -u root - # Dump database contents as is after upgrade - - mariadb-dump --all-databases --all-tablespaces --triggers --routines --events --skip-extended-insert > upgraded-database.sql - - | - mariadb --skip-column-names -e "SELECT @@version, @@version_comment" | tee /tmp/version - grep $MARIADB_MAJOR_VERSION /tmp/version || echo "MariaDB didn't install properly" - - mariadb --table -e "SELECT * FROM mysql.global_priv; SHOW CREATE USER root@localhost; SHOW CREATE USER 'mariadb.sys'@localhost" - - mariadb --table -e "SELECT * FROM mysql.plugin; SHOW PLUGINS" - - mariadb -e "SHUTDOWN;" - - rm -rf /var/lib/mysql/* # Clear datadir before next run - # Start database without install-db step - - sudo -u mysql /usr/sbin/mariadbd --skip-network --skip-grant & sleep 10 - # Dump database contents in initial state - - mariadb-dump --all-databases --all-tablespaces --triggers --routines --events --skip-extended-insert > empty-database.sql - artifacts: - paths: - - installed-database.sql - - upgraded-database.sql - -fedora upgrade: - stage: test - dependencies: - - fedora - script: - - yum install -y mariadb-server - # Fedora does not support running services in Docker (like Debian packages do) so start it manually - - /usr/libexec/mysql-check-socket - - /usr/libexec/mysql-prepare-db-dir - - sudo -u mysql /usr/libexec/mysqld --basedir=/usr & sleep 10 - # Dump database contents in installed state - - mariadb-dump --all-databases --all-tablespaces --triggers --routines --events --skip-extended-insert > old-installed-database.sql - - /usr/libexec/mysql-check-upgrade - # Dump database contents in upgraded state - - mariadb-dump --all-databases --all-tablespaces --triggers --routines --events --skip-extended-insert > old-upgraded-database.sql - - mariadb --skip-column-names -e "SELECT @@version, @@version_comment" # Show version - # @TODO: Upgrade from Fedora 33 MariaDB 10.4 to MariaDB.org latest does not work - # so do this manual step to remove conflicts until packaging is fixed - - yum remove -y mariadb-server-utils mariadb-gssapi-server mariadb-cracklib-password-check mariadb-backup mariadb-connector-c-config - - rm -f rpm/*debuginfo* # Not relevant in this test - - yum install -y rpm/*.rpm - # nothing provides galera-4 on Fedora, so this step fails if built with wsrep - - mysql -e "SHUTDOWN;" - - /usr/bin/mariadb-install-db # This step should not do anything on upgrades, just exit - - sudo -u mysql /usr/sbin/mariadbd & sleep 10 - # Dump database contents in installed state - - mariadb-dump --all-databases --all-tablespaces --triggers --routines --events --skip-extended-insert > new-installed-database.sql || true - # The step above fails on: mariadb-dump: Couldn't execute 'show events': Cannot proceed, because event scheduler is disabled (1577) - # @TODO: Since we did a manual start, we also need to run upgrade manually - - /usr/bin/mariadb-upgrade - # Dump database contents in upgraded state - - mariadb-dump --all-databases --all-tablespaces --triggers --routines --events --skip-extended-insert > new-upgraded-database.sql - - | - mariadb --skip-column-names -e "SELECT @@version, @@version_comment" | tee /tmp/version - grep $MARIADB_MAJOR_VERSION /tmp/version || echo "MariaDB didn't upgrade properly" - - mariadb --table -e "SELECT * FROM mysql.global_priv; SHOW CREATE USER root@localhost; SHOW CREATE USER 'mariadb.sys'@localhost" - - mariadb --table -e "SELECT * FROM mysql.plugin; SHOW PLUGINS" - artifacts: - paths: - - old-installed-database.sql - - old-upgraded-database.sql - - new-installed-database.sql - - new-upgraded-database.sql - -# Once all RPM builds and tests have passed, also run the DEB builds and tests -# @NOTE: This is likely to work well only on salsa.debian.org as the Gitlab.com -# runners are too small for everything this stage does. -# build_deb: -# stage: Salsa-CI -# trigger: -# include: debian/salsa-ci.yml diff --git a/CMakeLists.txt b/CMakeLists.txt index 84ac54ce155..7b9325e4209 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -550,7 +550,8 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) -INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme) +# INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme) +INSTALL_DOCUMENTATION(README.md COPYING THIRDPARTY COMPONENT Readme) # MDEV-6526 these files are not installed anymore #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC diff --git a/CREDITS b/CREDITS deleted file mode 100644 index 35092602ccf..00000000000 --- a/CREDITS +++ /dev/null @@ -1,57 +0,0 @@ -MariaDB is brought to you by the MariaDB Foundation, a non profit -organization registered in the USA. - -The current main sponsors of the MariaDB Foundation are: - -Alibaba Cloud https://www.alibabacloud.com/ (2017) -Intel https://www.intel.com (2022) -MariaDB Corporation https://www.mariadb.com (2013) -Microsoft https://microsoft.com/ (2017) -ServiceNow https://servicenow.com (2019) -SIT https://sit.org (2022) -Tencent Cloud https://cloud.tencent.com (2017) -Development Bank of Singapore https://dbs.com (2016) -IBM https://www.ibm.com (2017) -Visma https://visma.com (2015) -Automattic https://automattic.com (2019) -Galera Cluster https://galeracluster.com (2020) -Percona https://www.percona.com (2018) - -For a full list of sponsors, see -https://mariadb.org/about/#sponsors -and for individual contributors, see -https://mariadb.org/donate/individual-sponsors/ - -You can also get the list of sponsors by running SHOW CONTRIBUTORS. - -For all corporate sponsorships please contact the -MariaDB Foundation Board via foundation@mariadb.org. - -The MariaDB Foundation is responsible for the MariaDB source -repository, the official MariaDB binaries and http://mariadb.org. - -The MariaDB Foundation also provides, among other things, the -following services to the MariaDB community: - -- Code reviews and applying patches for MariaDB -- QA and testing of the MariaDB server -- Merging MySQL patches into MariaDB -- Bug fixing in MariaDB (for bugs that affects a large part of the community) -- Building the official MariaDB binaries -- Maintaining http://mariadb.org -- Documenting MariaDB in the MariaDB Knowledge Base http://mariadb.com/kb - -To be able to do the above we need help from corporations and individuals! - -You can help support MariaDB by becoming a MariaDB developer or a -sponsor of the MariaDB Foundation. To donate or sponsor, -go to https://mariadb.org/donate/ - -You can get a list of all the main authors of MariaDB / MySQL by running -SHOW AUTHORS; - -You can get a list sponsors and contributors by running -SHOW CONTRIBUTORS; - -You can read more about the MariaDB Foundation at: -https://mariadb.org/about/ diff --git a/INSTALL-WIN-SOURCE b/INSTALL-WIN-SOURCE deleted file mode 100644 index f10d13aa93b..00000000000 --- a/INSTALL-WIN-SOURCE +++ /dev/null @@ -1,3 +0,0 @@ -Up-to-date instructions about building MariaDB on Windows can be found -at: https://mariadb.com/kb/en/Building_MariaDB_on_Windows - diff --git a/KNOWN_BUGS.txt b/KNOWN_BUGS.txt deleted file mode 100644 index af65c98590d..00000000000 --- a/KNOWN_BUGS.txt +++ /dev/null @@ -1,15 +0,0 @@ -This file should contain all known fatal bugs in MariaDB for the last -source or binary release. Minor bugs, extensions and feature requests, -and bugs found since this release can be found in the MariaDB bugs -database at: https://jira.mariadb.org - -There should not normally be any bugs which affect normal operations -in any MariaDB release. Still, there are always exceptions and edge -cases and that is what this file is for. - -If you have find bug please add it to https://jira.mariadb.org so -that we are can try to fix it for the next release. You can also add -feature request to the JIRA. - -The latest documentation for the MariaDB server can be found at: -https://mariadb.com/kb diff --git a/README.md b/README.md index 0f77f0e7d46..f6b725caf96 100644 --- a/README.md +++ b/README.md @@ -195,7 +195,7 @@ sudo ${INSTALL_DIR}/bin/mysql -u root -S /tmp/mysqld3316.sock ### 9. Run mtr test locally Shutdown EloqSQL before running mtr tests. -#### 1. mono_basic and mono_main: +#### 1. eloq_basic and eloq_main: Edit eloqsql/concourse/scripts/mtr_bootstrap.cnf with the following example settings: ```ini [mariadb] @@ -234,7 +234,7 @@ eloq_dss_rocksdb_cloud_sst_file_cache_size = 20GB ``` -Run mono_basic and mono_main test +Run eloq_basic and eloq_main test ```bash pkill -9 dss_server rm -rf dss_data @@ -245,11 +245,11 @@ mc alias set ${minio_server_alias} http://127.0.0.1:9000 minioadmin minioadmin mc rb ${minio_server_alias}/dss-eloqsql-mtr-test --force mc rb ${minio_server_alias}/txlog-eloqsql-mtr-test --force -build/mysql-test/mtr --clean-txlog-bucket-restart --suite=mono_basic,mono_main --testcase-timeout=30 --bootstrap-defaults-file=concourse/scripts/mtr_bootstrap.cnf +build/mysql-test/mtr --clean-txlog-bucket-restart --suite=eloq_basic,eloq_main --testcase-timeout=30 --bootstrap-defaults-file=concourse/scripts/mtr_bootstrap.cnf ``` -#### 2. mono_multi: +#### 2. eloq_multi: Edit eloqsql/concourse/scripts/mtr_multi_bootstrap.cnf with the following example settings: ```ini @@ -267,7 +267,7 @@ eloq_dss_rocksdb_cloud_endpoint_url=http://127.0.0.1:9000 eloq_dss_rocksdb_cloud_bucket_name = eloqsql-mtr-test eloq_dss_rocksdb_cloud_bucket_prefix = dss- eloq_dss_rocksdb_cloud_region = ap-northeast-1 -eloq_dss_peer_node=localhost:9100 # add this line for mono_multi +eloq_dss_peer_node=localhost:9100 # add this line for eloq_multi ... @@ -304,12 +304,12 @@ eloq_dss_rocksdb_cloud_endpoint_url=http://127.0.0.1:9000 eloq_dss_rocksdb_cloud_bucket_name = eloqsql-mtr-test eloq_dss_rocksdb_cloud_bucket_prefix = dss- eloq_dss_rocksdb_cloud_region = ap-northeast-1 -eloq_dss_peer_node = localhost:9100 # add this line for mono_multi +eloq_dss_peer_node = localhost:9100 # add this line for eloq_multi eloq_dss_rocksdb_cloud_sst_file_cache_size = 20GB ``` -Run mono_multi test +Run eloq_multi test ```bash pkill -9 dss_server rm -rf dss_data @@ -322,7 +322,7 @@ mc rb ${minio_server_alias}/txlog-eloqsql-mtr-test --force nohup ${INSTALL_DIR}/bin/dss_server --config=concourse/scripts/dss_server.ini & -build/mysql-test/mtr --clean-txlog-bucket-restart --suite=mono_multi --bootstrap-defaults-file=concourse/scripts/mtr_multi_bootstrap.cnf +build/mysql-test/mtr --clean-txlog-bucket-restart --suite=eloq_multi --bootstrap-defaults-file=concourse/scripts/mtr_multi_bootstrap.cnf ``` diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 8e7b0fcb715..00000000000 --- a/appveyor.yml +++ /dev/null @@ -1,30 +0,0 @@ -version: build-{build}~branch-{branch} - -clone_depth: 1 - -build_script: - # dump some system info - - echo processor='%PROCESSOR_IDENTIFIER%' , processor count= %NUMBER_OF_PROCESSORS% - - cd %APPVEYOR_BUILD_FOLDER% - # Disable unneeded submodules for the faster build - - git config submodule.storage/columnstore/columnstore.update none - - git config submodule.storage/maria/libmarias3.update none - - git config submodule.storage/rocksdb/rocksdb.update none - - git config submodule.wsrep-lib.update none - # Build minimal configuration - - mkdir _build - - cd _build - - set BUILD_TYPE=MinSizeRel - - set GENERATOR=-GNinja - - call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" - - cmake -E time cmake %GENERATOR% .. -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DMYSQL_MAINTAINER_MODE=ERR -DFAST_BUILD=1 -DBISON_EXECUTABLE=C:\cygwin64\bin\bison.exe -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_FEEDBACK=NO - - set /A jobs=2*%NUMBER_OF_PROCESSORS% - - cmake -E time cmake --build . -j %jobs% --config %BUILD_TYPE% --target minbuild - -test_script: - - set PATH=C:\Strawberry\perl\bin;%PATH%;C:\Program Files (x86)\Windows Kits\10\Debuggers\x64 - - cd %APPVEYOR_BUILD_FOLDER%\_build\mysql-test - - set /A parallel=4*%NUMBER_OF_PROCESSORS% - - perl mysql-test-run.pl --force --max-test-fail=10 --retry=2 --parallel=%parallel% --testcase-timeout=4 --suite=main --skip-test-list=%APPVEYOR_BUILD_FOLDER%\win\appveyor_skip_tests.txt --mysqld=--loose-innodb-flush-log-at-trx-commit=2 - -image: Visual Studio 2022 diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake index 06bdfce14de..c827952c54a 100644 --- a/cmake/mysql_add_executable.cmake +++ b/cmake/mysql_add_executable.cmake @@ -120,4 +120,34 @@ FUNCTION (MYSQL_ADD_EXECUTABLE) INSTALL(PROGRAMS $/${link} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP}) ENDIF() ENDIF() + + # create ELOQSQL named "links" + GET_ELOQSQL_SYMLINK(${target} link) + IF(link) + IF(UNIX) + ADD_CUSTOM_COMMAND(TARGET ${target} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E create_symlink + ${target} ${link} + COMMENT "Creating ${link} link" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}) + INSTALL(PROGRAMS + ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${link} + DESTINATION + ${ARG_DESTINATION} + COMPONENT ${COMP}) + ELSE() + # Windows note: + # Here, hardlinks are used, because cmake can't install symlinks. + # In packages, there are won't be links, just copies. + SET(link ${link}.exe) + ADD_CUSTOM_COMMAND(TARGET ${target} POST_BUILD + COMMAND cmake -E remove -f ${link} + COMMAND mklink /H ${link} $ + COMMENT "Creating ${link} link" + WORKING_DIRECTORY $) + INSTALL(PROGRAMS $/${link} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP}) + ENDIF() + ENDIF() + + ENDFUNCTION() diff --git a/cmake/symlinks.cmake b/cmake/symlinks.cmake index 3f3b4e4a9b5..0ad74a81728 100644 --- a/cmake/symlinks.cmake +++ b/cmake/symlinks.cmake @@ -52,3 +52,30 @@ MACRO(GET_SYMLINK name out) list(GET MARIADB_SYMLINK_TOS ${_index} ${out}) endif() ENDMACRO() + + +if(COMMAND REGISTER_ELOQSQL_SYMLINK) + return() +endif() + +macro(REGISTER_ELOQSQL_SYMLINK from to) + list(APPEND ELOQSQL_SYMLINK_FROMS ${from}) + list(APPEND ELOQSQL_SYMLINK_TOS ${to}) +endmacro() + +REGISTER_ELOQSQL_SYMLINK("mariadbd" "eloqsql") +REGISTER_ELOQSQL_SYMLINK("mariadb" "eloqsql-cli") +REGISTER_ELOQSQL_SYMLINK("mariadbd-safe" "eloqsql-safe") +REGISTER_ELOQSQL_SYMLINK("mariadbd-safe-helper" "eloqsql-safe-helper") +REGISTER_ELOQSQL_SYMLINK("mariadb-install-db" "eloqsql-install-db") + + + + +MACRO(GET_ELOQSQL_SYMLINK name out) + set(${out}) + list(FIND ELOQSQL_SYMLINK_FROMS ${name} _index) + if (${_index} GREATER -1) + list(GET ELOQSQL_SYMLINK_TOS ${_index} ${out}) + endif() +ENDMACRO() \ No newline at end of file diff --git a/concourse/scripts/main.bash b/concourse/scripts/main.bash index 10d842bdafc..fc4d6640fc8 100755 --- a/concourse/scripts/main.bash +++ b/concourse/scripts/main.bash @@ -211,8 +211,8 @@ mc rb minio_server/dss-${bucket_name} --force; \ mc rb minio_server/txlog-${bucket_name} --force set -e -echo "running mono_main,mono_basic" -./mtr --suite=mono_main,mono_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap.cnf +echo "running eloq_main,eloq_basic" +./mtr --suite=eloq_main,eloq_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap.cnf # Clean up minio buckets echo "cleaning minio buckets" @@ -235,8 +235,8 @@ echo "starting dss_server" nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & sleep 5 -echo "running mono_multi" -./mtr --suite=mono_multi --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap.cnf +echo "running eloq_multi" +./mtr --suite=eloq_multi --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap.cnf # Clean up minio bucket # If mtr test failed, it would not be run. diff --git a/concourse/scripts/main.ent.bash b/concourse/scripts/main.ent.bash index 96d4d41883b..4c47a76ed14 100755 --- a/concourse/scripts/main.ent.bash +++ b/concourse/scripts/main.ent.bash @@ -222,8 +222,8 @@ mc rb ${minio_server_alias}/dss-${bucket_name} --force; \ mc rb ${minio_server_alias}/txlog-${bucket_name} --force set -e -echo "running mono_main,mono_basic" -./mtr --clean-txlog-bucket-restart --suite=mono_main,mono_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap.cnf +echo "running eloq_main,eloq_basic" +./mtr --clean-txlog-bucket-restart --suite=eloq_main,eloq_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_bootstrap.cnf # Clean up minio buckets echo "cleaning minio buckets" @@ -246,8 +246,8 @@ echo "starting dss_server" nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & sleep 5 -echo "running mono_multi" -./mtr --clean-txlog-bucket-restart --suite=mono_multi --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap.cnf +echo "running eloq_multi" +./mtr --clean-txlog-bucket-restart --suite=eloq_multi --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_src/concourse/scripts/mtr_multi_bootstrap.cnf # Clean up minio bucket # If mtr test failed, it would not be run. diff --git a/concourse/scripts/pr.ent.bash b/concourse/scripts/pr.ent.bash index 2106bae2a16..189bc10d019 100755 --- a/concourse/scripts/pr.ent.bash +++ b/concourse/scripts/pr.ent.bash @@ -243,8 +243,8 @@ mc rb ${minio_server_alias}/dss-${bucket_name} --force; \ mc rb ${minio_server_alias}/txlog-${bucket_name} --force set -e -echo "running mono_main,mono_basic" -./mtr --clean-txlog-bucket-restart --suite=mono_main,mono_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap.cnf +echo "running eloq_main,eloq_basic" +./mtr --clean-txlog-bucket-restart --suite=eloq_main,eloq_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap.cnf # Clean up minio buckets echo "cleaning minio buckets" @@ -267,8 +267,8 @@ echo "starting dss_server" nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini > dss_server.log 2>&1 & sleep 5 -echo "running mono_multi" -./mtr --suite=mono_multi --clean-txlog-bucket-restart --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap.cnf +echo "running eloq_multi" +./mtr --suite=eloq_multi --clean-txlog-bucket-restart --force --bootstrap-defaults-file=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_multi_bootstrap.cnf # Clean up minio bucket # If mtr test failed, it would not be run. diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 9eec793c9fb..0f4504082cf 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -224,6 +224,7 @@ IF(UNIX AND NOT WITHOUT_SERVER) COMPONENT Server) INSTALL_LINK(mariadb-install-db mysql_install_db ${INSTALL_SCRIPTDIR} Server) + INSTALL_LINK(mariadb-install-db eloqsql-install-db ${INSTALL_SCRIPTDIR} Server) ENDIF() SET(prefix "${CMAKE_INSTALL_PREFIX}") diff --git a/my-config.cnf b/scripts/eloqsql.cnf similarity index 100% rename from my-config.cnf rename to scripts/eloqsql.cnf diff --git a/storage/eloq/mysql-test/mono_basic/disabled.def b/storage/eloq/mysql-test/eloq_basic/disabled.def similarity index 100% rename from storage/eloq/mysql-test/mono_basic/disabled.def rename to storage/eloq/mysql-test/eloq_basic/disabled.def diff --git a/storage/eloq/mysql-test/mono_basic/include/have_eloq.inc b/storage/eloq/mysql-test/eloq_basic/include/have_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_basic/include/have_eloq.inc rename to storage/eloq/mysql-test/eloq_basic/include/have_eloq.inc diff --git a/storage/eloq/mysql-test/mono_basic/include/have_hash_partition.inc b/storage/eloq/mysql-test/eloq_basic/include/have_hash_partition.inc similarity index 100% rename from storage/eloq/mysql-test/mono_basic/include/have_hash_partition.inc rename to storage/eloq/mysql-test/eloq_basic/include/have_hash_partition.inc diff --git a/storage/eloq/mysql-test/mono_basic/include/have_range_partition.inc b/storage/eloq/mysql-test/eloq_basic/include/have_range_partition.inc similarity index 100% rename from storage/eloq/mysql-test/mono_basic/include/have_range_partition.inc rename to storage/eloq/mysql-test/eloq_basic/include/have_range_partition.inc diff --git a/storage/eloq/mysql-test/mono_basic/include/update_use_source_eloq.inc b/storage/eloq/mysql-test/eloq_basic/include/update_use_source_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_basic/include/update_use_source_eloq.inc rename to storage/eloq/mysql-test/eloq_basic/include/update_use_source_eloq.inc diff --git a/storage/eloq/mysql-test/mono_basic/my.cnf b/storage/eloq/mysql-test/eloq_basic/my.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/my.cnf rename to storage/eloq/mysql-test/eloq_basic/my.cnf diff --git a/storage/eloq/mysql-test/mono_basic/r/alter_db.result b/storage/eloq/mysql-test/eloq_basic/r/alter_db.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/alter_db.result rename to storage/eloq/mysql-test/eloq_basic/r/alter_db.result diff --git a/storage/eloq/mysql-test/mono_basic/r/alter_table.result b/storage/eloq/mysql-test/eloq_basic/r/alter_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/alter_table.result rename to storage/eloq/mysql-test/eloq_basic/r/alter_table.result diff --git a/storage/eloq/mysql-test/mono_basic/r/alter_table_recovery.result b/storage/eloq/mysql-test/eloq_basic/r/alter_table_recovery.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/alter_table_recovery.result rename to storage/eloq/mysql-test/eloq_basic/r/alter_table_recovery.result diff --git a/storage/eloq/mysql-test/mono_basic/r/auto_commit.result b/storage/eloq/mysql-test/eloq_basic/r/auto_commit.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/auto_commit.result rename to storage/eloq/mysql-test/eloq_basic/r/auto_commit.result diff --git a/storage/eloq/mysql-test/mono_basic/r/batch_pk_load_s.result b/storage/eloq/mysql-test/eloq_basic/r/batch_pk_load_s.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/batch_pk_load_s.result rename to storage/eloq/mysql-test/eloq_basic/r/batch_pk_load_s.result diff --git a/storage/eloq/mysql-test/mono_basic/r/collation_restriction.result b/storage/eloq/mysql-test/eloq_basic/r/collation_restriction.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/collation_restriction.result rename to storage/eloq/mysql-test/eloq_basic/r/collation_restriction.result diff --git a/storage/eloq/mysql-test/mono_basic/r/create_drop_index.result b/storage/eloq/mysql-test/eloq_basic/r/create_drop_index.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/create_drop_index.result rename to storage/eloq/mysql-test/eloq_basic/r/create_drop_index.result diff --git a/storage/eloq/mysql-test/mono_basic/r/create_drop_table_recovery.result b/storage/eloq/mysql-test/eloq_basic/r/create_drop_table_recovery.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/create_drop_table_recovery.result rename to storage/eloq/mysql-test/eloq_basic/r/create_drop_table_recovery.result diff --git a/storage/eloq/mysql-test/mono_basic/r/data_store_error.result b/storage/eloq/mysql-test/eloq_basic/r/data_store_error.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/data_store_error.result rename to storage/eloq/mysql-test/eloq_basic/r/data_store_error.result diff --git a/storage/eloq/mysql-test/mono_basic/r/data_type.result b/storage/eloq/mysql-test/eloq_basic/r/data_type.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/data_type.result rename to storage/eloq/mysql-test/eloq_basic/r/data_type.result diff --git a/storage/eloq/mysql-test/mono_basic/r/deadlock_handling.result b/storage/eloq/mysql-test/eloq_basic/r/deadlock_handling.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/deadlock_handling.result rename to storage/eloq/mysql-test/eloq_basic/r/deadlock_handling.result diff --git a/storage/eloq/mysql-test/mono_basic/r/drop_table.result b/storage/eloq/mysql-test/eloq_basic/r/drop_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/drop_table.result rename to storage/eloq/mysql-test/eloq_basic/r/drop_table.result diff --git a/storage/eloq/mysql-test/mono_basic/r/fault_inject_term_neg_Execute.result b/storage/eloq/mysql-test/eloq_basic/r/fault_inject_term_neg_Execute.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/fault_inject_term_neg_Execute.result rename to storage/eloq/mysql-test/eloq_basic/r/fault_inject_term_neg_Execute.result diff --git a/storage/eloq/mysql-test/mono_basic/r/flush_undo_while_ckpt.result b/storage/eloq/mysql-test/eloq_basic/r/flush_undo_while_ckpt.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/flush_undo_while_ckpt.result rename to storage/eloq/mysql-test/eloq_basic/r/flush_undo_while_ckpt.result diff --git a/storage/eloq/mysql-test/mono_basic/r/isolation_level_for_locking.result b/storage/eloq/mysql-test/eloq_basic/r/isolation_level_for_locking.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/isolation_level_for_locking.result rename to storage/eloq/mysql-test/eloq_basic/r/isolation_level_for_locking.result diff --git a/storage/eloq/mysql-test/mono_basic/r/isolation_level_for_mvcc.result b/storage/eloq/mysql-test/eloq_basic/r/isolation_level_for_mvcc.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/isolation_level_for_mvcc.result rename to storage/eloq/mysql-test/eloq_basic/r/isolation_level_for_mvcc.result diff --git a/storage/eloq/mysql-test/mono_basic/r/isolation_level_for_occ.result b/storage/eloq/mysql-test/eloq_basic/r/isolation_level_for_occ.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/isolation_level_for_occ.result rename to storage/eloq/mysql-test/eloq_basic/r/isolation_level_for_occ.result diff --git a/storage/eloq/mysql-test/mono_basic/r/key_cache.result b/storage/eloq/mysql-test/eloq_basic/r/key_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/key_cache.result rename to storage/eloq/mysql-test/eloq_basic/r/key_cache.result diff --git a/storage/eloq/mysql-test/mono_basic/r/magic_table_name.result b/storage/eloq/mysql-test/eloq_basic/r/magic_table_name.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/magic_table_name.result rename to storage/eloq/mysql-test/eloq_basic/r/magic_table_name.result diff --git a/storage/eloq/mysql-test/mono_basic/r/merge_scanner_wset.result b/storage/eloq/mysql-test/eloq_basic/r/merge_scanner_wset.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/merge_scanner_wset.result rename to storage/eloq/mysql-test/eloq_basic/r/merge_scanner_wset.result diff --git a/storage/eloq/mysql-test/mono_basic/r/mvcc_archives_recycle.result b/storage/eloq/mysql-test/eloq_basic/r/mvcc_archives_recycle.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/mvcc_archives_recycle.result rename to storage/eloq/mysql-test/eloq_basic/r/mvcc_archives_recycle.result diff --git a/storage/eloq/mysql-test/mono_basic/r/mvcc_read_after_flushing_deleted_record.result b/storage/eloq/mysql-test/eloq_basic/r/mvcc_read_after_flushing_deleted_record.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/mvcc_read_after_flushing_deleted_record.result rename to storage/eloq/mysql-test/eloq_basic/r/mvcc_read_after_flushing_deleted_record.result diff --git a/storage/eloq/mysql-test/mono_basic/r/mvcc_read_unique_sk_after_flushing_deleted_record.result b/storage/eloq/mysql-test/eloq_basic/r/mvcc_read_unique_sk_after_flushing_deleted_record.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/mvcc_read_unique_sk_after_flushing_deleted_record.result rename to storage/eloq/mysql-test/eloq_basic/r/mvcc_read_unique_sk_after_flushing_deleted_record.result diff --git a/storage/eloq/mysql-test/mono_basic/r/mvcc_scan.result b/storage/eloq/mysql-test/eloq_basic/r/mvcc_scan.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/mvcc_scan.result rename to storage/eloq/mysql-test/eloq_basic/r/mvcc_scan.result diff --git a/storage/eloq/mysql-test/mono_basic/r/mvcc_scan_after_flushing_deleted_record.result b/storage/eloq/mysql-test/eloq_basic/r/mvcc_scan_after_flushing_deleted_record.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/mvcc_scan_after_flushing_deleted_record.result rename to storage/eloq/mysql-test/eloq_basic/r/mvcc_scan_after_flushing_deleted_record.result diff --git a/storage/eloq/mysql-test/mono_basic/r/mvcc_scan_sk.result b/storage/eloq/mysql-test/eloq_basic/r/mvcc_scan_sk.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/mvcc_scan_sk.result rename to storage/eloq/mysql-test/eloq_basic/r/mvcc_scan_sk.result diff --git a/storage/eloq/mysql-test/mono_basic/r/mvcc_unique_sk_lookup.result b/storage/eloq/mysql-test/eloq_basic/r/mvcc_unique_sk_lookup.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/mvcc_unique_sk_lookup.result rename to storage/eloq/mysql-test/eloq_basic/r/mvcc_unique_sk_lookup.result diff --git a/storage/eloq/mysql-test/mono_basic/r/poor_performance.result b/storage/eloq/mysql-test/eloq_basic/r/poor_performance.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/poor_performance.result rename to storage/eloq/mysql-test/eloq_basic/r/poor_performance.result diff --git a/storage/eloq/mysql-test/mono_basic/r/primary_key.result b/storage/eloq/mysql-test/eloq_basic/r/primary_key.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/primary_key.result rename to storage/eloq/mysql-test/eloq_basic/r/primary_key.result diff --git a/storage/eloq/mysql-test/mono_basic/r/pushdown_cond.result b/storage/eloq/mysql-test/eloq_basic/r/pushdown_cond.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/pushdown_cond.result rename to storage/eloq/mysql-test/eloq_basic/r/pushdown_cond.result diff --git a/storage/eloq/mysql-test/mono_basic/r/range_split_keycache.result b/storage/eloq/mysql-test/eloq_basic/r/range_split_keycache.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/range_split_keycache.result rename to storage/eloq/mysql-test/eloq_basic/r/range_split_keycache.result diff --git a/storage/eloq/mysql-test/mono_basic/r/read_committed_sk_scan.result b/storage/eloq/mysql-test/eloq_basic/r/read_committed_sk_scan.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/read_committed_sk_scan.result rename to storage/eloq/mysql-test/eloq_basic/r/read_committed_sk_scan.result diff --git a/storage/eloq/mysql-test/mono_basic/r/rnd.result b/storage/eloq/mysql-test/eloq_basic/r/rnd.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/rnd.result rename to storage/eloq/mysql-test/eloq_basic/r/rnd.result diff --git a/storage/eloq/mysql-test/mono_basic/r/s_scan_remainer_lock.result b/storage/eloq/mysql-test/eloq_basic/r/s_scan_remainer_lock.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/s_scan_remainer_lock.result rename to storage/eloq/mysql-test/eloq_basic/r/s_scan_remainer_lock.result diff --git a/storage/eloq/mysql-test/mono_basic/r/secondary_key.result b/storage/eloq/mysql-test/eloq_basic/r/secondary_key.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/secondary_key.result rename to storage/eloq/mysql-test/eloq_basic/r/secondary_key.result diff --git a/storage/eloq/mysql-test/mono_basic/r/select_for_update_and_share.result b/storage/eloq/mysql-test/eloq_basic/r/select_for_update_and_share.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/select_for_update_and_share.result rename to storage/eloq/mysql-test/eloq_basic/r/select_for_update_and_share.result diff --git a/storage/eloq/mysql-test/mono_basic/r/select_for_update_and_share_occ.result b/storage/eloq/mysql-test/eloq_basic/r/select_for_update_and_share_occ.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/select_for_update_and_share_occ.result rename to storage/eloq/mysql-test/eloq_basic/r/select_for_update_and_share_occ.result diff --git a/storage/eloq/mysql-test/mono_basic/r/single_auto_increment.result b/storage/eloq/mysql-test/eloq_basic/r/single_auto_increment.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/single_auto_increment.result rename to storage/eloq/mysql-test/eloq_basic/r/single_auto_increment.result diff --git a/storage/eloq/mysql-test/mono_basic/r/single_dead_lock_check.result b/storage/eloq/mysql-test/eloq_basic/r/single_dead_lock_check.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/single_dead_lock_check.result rename to storage/eloq/mysql-test/eloq_basic/r/single_dead_lock_check.result diff --git a/storage/eloq/mysql-test/mono_basic/r/single_node.result b/storage/eloq/mysql-test/eloq_basic/r/single_node.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/single_node.result rename to storage/eloq/mysql-test/eloq_basic/r/single_node.result diff --git a/storage/eloq/mysql-test/mono_basic/r/statistics.result b/storage/eloq/mysql-test/eloq_basic/r/statistics.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/statistics.result rename to storage/eloq/mysql-test/eloq_basic/r/statistics.result diff --git a/storage/eloq/mysql-test/mono_basic/r/temporary_table.result b/storage/eloq/mysql-test/eloq_basic/r/temporary_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/temporary_table.result rename to storage/eloq/mysql-test/eloq_basic/r/temporary_table.result diff --git a/storage/eloq/mysql-test/mono_basic/r/unique_sk_lookup.result b/storage/eloq/mysql-test/eloq_basic/r/unique_sk_lookup.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/unique_sk_lookup.result rename to storage/eloq/mysql-test/eloq_basic/r/unique_sk_lookup.result diff --git a/storage/eloq/mysql-test/mono_basic/r/unsupported_sql.result b/storage/eloq/mysql-test/eloq_basic/r/unsupported_sql.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/unsupported_sql.result rename to storage/eloq/mysql-test/eloq_basic/r/unsupported_sql.result diff --git a/storage/eloq/mysql-test/mono_basic/r/update_record_with_sk.result b/storage/eloq/mysql-test/eloq_basic/r/update_record_with_sk.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/update_record_with_sk.result rename to storage/eloq/mysql-test/eloq_basic/r/update_record_with_sk.result diff --git a/storage/eloq/mysql-test/mono_basic/r/upsert_table_recovery.result b/storage/eloq/mysql-test/eloq_basic/r/upsert_table_recovery.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/upsert_table_recovery.result rename to storage/eloq/mysql-test/eloq_basic/r/upsert_table_recovery.result diff --git a/storage/eloq/mysql-test/mono_basic/r/write_log_unknown.result b/storage/eloq/mysql-test/eloq_basic/r/write_log_unknown.result similarity index 100% rename from storage/eloq/mysql-test/mono_basic/r/write_log_unknown.result rename to storage/eloq/mysql-test/eloq_basic/r/write_log_unknown.result diff --git a/storage/eloq/mysql-test/mono_basic/t/alter_db.test b/storage/eloq/mysql-test/eloq_basic/t/alter_db.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/alter_db.test rename to storage/eloq/mysql-test/eloq_basic/t/alter_db.test diff --git a/storage/eloq/mysql-test/mono_basic/t/alter_table.test b/storage/eloq/mysql-test/eloq_basic/t/alter_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/alter_table.test rename to storage/eloq/mysql-test/eloq_basic/t/alter_table.test diff --git a/storage/eloq/mysql-test/mono_basic/t/alter_table_recovery.test b/storage/eloq/mysql-test/eloq_basic/t/alter_table_recovery.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/alter_table_recovery.test rename to storage/eloq/mysql-test/eloq_basic/t/alter_table_recovery.test diff --git a/storage/eloq/mysql-test/mono_basic/t/auto_commit.test b/storage/eloq/mysql-test/eloq_basic/t/auto_commit.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/auto_commit.test rename to storage/eloq/mysql-test/eloq_basic/t/auto_commit.test diff --git a/storage/eloq/mysql-test/mono_basic/t/batch_pk_load_s.test b/storage/eloq/mysql-test/eloq_basic/t/batch_pk_load_s.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/batch_pk_load_s.test rename to storage/eloq/mysql-test/eloq_basic/t/batch_pk_load_s.test diff --git a/storage/eloq/mysql-test/mono_basic/t/collation_restriction.test b/storage/eloq/mysql-test/eloq_basic/t/collation_restriction.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/collation_restriction.test rename to storage/eloq/mysql-test/eloq_basic/t/collation_restriction.test diff --git a/storage/eloq/mysql-test/mono_basic/t/create_drop_index.test b/storage/eloq/mysql-test/eloq_basic/t/create_drop_index.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/create_drop_index.test rename to storage/eloq/mysql-test/eloq_basic/t/create_drop_index.test diff --git a/storage/eloq/mysql-test/mono_basic/t/create_drop_table_recovery.test b/storage/eloq/mysql-test/eloq_basic/t/create_drop_table_recovery.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/create_drop_table_recovery.test rename to storage/eloq/mysql-test/eloq_basic/t/create_drop_table_recovery.test diff --git a/storage/eloq/mysql-test/mono_basic/t/data_store_error.test b/storage/eloq/mysql-test/eloq_basic/t/data_store_error.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/data_store_error.test rename to storage/eloq/mysql-test/eloq_basic/t/data_store_error.test diff --git a/storage/eloq/mysql-test/mono_basic/t/data_type.test b/storage/eloq/mysql-test/eloq_basic/t/data_type.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/data_type.test rename to storage/eloq/mysql-test/eloq_basic/t/data_type.test diff --git a/storage/eloq/mysql-test/mono_basic/t/deadlock_handling.cnf b/storage/eloq/mysql-test/eloq_basic/t/deadlock_handling.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/deadlock_handling.cnf rename to storage/eloq/mysql-test/eloq_basic/t/deadlock_handling.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/deadlock_handling.test b/storage/eloq/mysql-test/eloq_basic/t/deadlock_handling.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/deadlock_handling.test rename to storage/eloq/mysql-test/eloq_basic/t/deadlock_handling.test diff --git a/storage/eloq/mysql-test/mono_basic/t/drop_table.test b/storage/eloq/mysql-test/eloq_basic/t/drop_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/drop_table.test rename to storage/eloq/mysql-test/eloq_basic/t/drop_table.test diff --git a/storage/eloq/mysql-test/mono_basic/t/fault_inject_term_neg_Execute.test b/storage/eloq/mysql-test/eloq_basic/t/fault_inject_term_neg_Execute.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/fault_inject_term_neg_Execute.test rename to storage/eloq/mysql-test/eloq_basic/t/fault_inject_term_neg_Execute.test diff --git a/storage/eloq/mysql-test/mono_basic/t/flush_undo_while_ckpt.cnf b/storage/eloq/mysql-test/eloq_basic/t/flush_undo_while_ckpt.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/flush_undo_while_ckpt.cnf rename to storage/eloq/mysql-test/eloq_basic/t/flush_undo_while_ckpt.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/flush_undo_while_ckpt.test b/storage/eloq/mysql-test/eloq_basic/t/flush_undo_while_ckpt.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/flush_undo_while_ckpt.test rename to storage/eloq/mysql-test/eloq_basic/t/flush_undo_while_ckpt.test diff --git a/storage/eloq/mysql-test/mono_basic/t/isolation_level_for_locking.cnf b/storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_locking.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/isolation_level_for_locking.cnf rename to storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_locking.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/isolation_level_for_locking.test b/storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_locking.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/isolation_level_for_locking.test rename to storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_locking.test diff --git a/storage/eloq/mysql-test/mono_basic/t/isolation_level_for_mvcc.cnf b/storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_mvcc.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/isolation_level_for_mvcc.cnf rename to storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_mvcc.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/isolation_level_for_mvcc.test b/storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_mvcc.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/isolation_level_for_mvcc.test rename to storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_mvcc.test diff --git a/storage/eloq/mysql-test/mono_basic/t/isolation_level_for_occ.cnf b/storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_occ.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/isolation_level_for_occ.cnf rename to storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_occ.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/isolation_level_for_occ.test b/storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_occ.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/isolation_level_for_occ.test rename to storage/eloq/mysql-test/eloq_basic/t/isolation_level_for_occ.test diff --git a/storage/eloq/mysql-test/mono_basic/t/key_cache.cnf b/storage/eloq/mysql-test/eloq_basic/t/key_cache.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/key_cache.cnf rename to storage/eloq/mysql-test/eloq_basic/t/key_cache.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/key_cache.test b/storage/eloq/mysql-test/eloq_basic/t/key_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/key_cache.test rename to storage/eloq/mysql-test/eloq_basic/t/key_cache.test diff --git a/storage/eloq/mysql-test/mono_basic/t/magic_table_name.test b/storage/eloq/mysql-test/eloq_basic/t/magic_table_name.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/magic_table_name.test rename to storage/eloq/mysql-test/eloq_basic/t/magic_table_name.test diff --git a/storage/eloq/mysql-test/mono_basic/t/merge_scanner_wset.test b/storage/eloq/mysql-test/eloq_basic/t/merge_scanner_wset.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/merge_scanner_wset.test rename to storage/eloq/mysql-test/eloq_basic/t/merge_scanner_wset.test diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_archives_recycle.cnf b/storage/eloq/mysql-test/eloq_basic/t/mvcc_archives_recycle.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_archives_recycle.cnf rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_archives_recycle.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_archives_recycle.test b/storage/eloq/mysql-test/eloq_basic/t/mvcc_archives_recycle.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_archives_recycle.test rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_archives_recycle.test diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_read_after_flushing_deleted_record.cnf b/storage/eloq/mysql-test/eloq_basic/t/mvcc_read_after_flushing_deleted_record.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_read_after_flushing_deleted_record.cnf rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_read_after_flushing_deleted_record.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_read_after_flushing_deleted_record.test b/storage/eloq/mysql-test/eloq_basic/t/mvcc_read_after_flushing_deleted_record.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_read_after_flushing_deleted_record.test rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_read_after_flushing_deleted_record.test diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_read_unique_sk_after_flushing_deleted_record.cnf b/storage/eloq/mysql-test/eloq_basic/t/mvcc_read_unique_sk_after_flushing_deleted_record.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_read_unique_sk_after_flushing_deleted_record.cnf rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_read_unique_sk_after_flushing_deleted_record.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_read_unique_sk_after_flushing_deleted_record.test b/storage/eloq/mysql-test/eloq_basic/t/mvcc_read_unique_sk_after_flushing_deleted_record.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_read_unique_sk_after_flushing_deleted_record.test rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_read_unique_sk_after_flushing_deleted_record.test diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_scan.cnf b/storage/eloq/mysql-test/eloq_basic/t/mvcc_scan.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_scan.cnf rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_scan.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_scan.test b/storage/eloq/mysql-test/eloq_basic/t/mvcc_scan.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_scan.test rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_scan.test diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_scan_after_flushing_deleted_record.cnf b/storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_after_flushing_deleted_record.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_scan_after_flushing_deleted_record.cnf rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_after_flushing_deleted_record.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_scan_after_flushing_deleted_record.test b/storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_after_flushing_deleted_record.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_scan_after_flushing_deleted_record.test rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_after_flushing_deleted_record.test diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_scan_sk.cnf b/storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_sk.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_scan_sk.cnf rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_sk.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_scan_sk.test b/storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_sk.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_scan_sk.test rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_sk.test diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_scan_sk_rc_isolvl.cnf b/storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_sk_rc_isolvl.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_scan_sk_rc_isolvl.cnf rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_sk_rc_isolvl.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_scan_sk_rc_isolvl.test b/storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_sk_rc_isolvl.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_scan_sk_rc_isolvl.test rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_scan_sk_rc_isolvl.test diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_unique_sk_lookup.cnf b/storage/eloq/mysql-test/eloq_basic/t/mvcc_unique_sk_lookup.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_unique_sk_lookup.cnf rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_unique_sk_lookup.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/mvcc_unique_sk_lookup.test b/storage/eloq/mysql-test/eloq_basic/t/mvcc_unique_sk_lookup.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/mvcc_unique_sk_lookup.test rename to storage/eloq/mysql-test/eloq_basic/t/mvcc_unique_sk_lookup.test diff --git a/storage/eloq/mysql-test/mono_basic/t/poor_performance.cnf b/storage/eloq/mysql-test/eloq_basic/t/poor_performance.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/poor_performance.cnf rename to storage/eloq/mysql-test/eloq_basic/t/poor_performance.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/poor_performance.test b/storage/eloq/mysql-test/eloq_basic/t/poor_performance.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/poor_performance.test rename to storage/eloq/mysql-test/eloq_basic/t/poor_performance.test diff --git a/storage/eloq/mysql-test/mono_basic/t/primary_key.test b/storage/eloq/mysql-test/eloq_basic/t/primary_key.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/primary_key.test rename to storage/eloq/mysql-test/eloq_basic/t/primary_key.test diff --git a/storage/eloq/mysql-test/mono_basic/t/pushdown_cond.test b/storage/eloq/mysql-test/eloq_basic/t/pushdown_cond.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/pushdown_cond.test rename to storage/eloq/mysql-test/eloq_basic/t/pushdown_cond.test diff --git a/storage/eloq/mysql-test/mono_basic/t/range_split_keycache.cnf b/storage/eloq/mysql-test/eloq_basic/t/range_split_keycache.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/range_split_keycache.cnf rename to storage/eloq/mysql-test/eloq_basic/t/range_split_keycache.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/range_split_keycache.test b/storage/eloq/mysql-test/eloq_basic/t/range_split_keycache.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/range_split_keycache.test rename to storage/eloq/mysql-test/eloq_basic/t/range_split_keycache.test diff --git a/storage/eloq/mysql-test/mono_basic/t/read_committed_sk_scan.test b/storage/eloq/mysql-test/eloq_basic/t/read_committed_sk_scan.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/read_committed_sk_scan.test rename to storage/eloq/mysql-test/eloq_basic/t/read_committed_sk_scan.test diff --git a/storage/eloq/mysql-test/mono_basic/t/rnd.test b/storage/eloq/mysql-test/eloq_basic/t/rnd.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/rnd.test rename to storage/eloq/mysql-test/eloq_basic/t/rnd.test diff --git a/storage/eloq/mysql-test/mono_basic/t/s_scan_remainer_lock.test b/storage/eloq/mysql-test/eloq_basic/t/s_scan_remainer_lock.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/s_scan_remainer_lock.test rename to storage/eloq/mysql-test/eloq_basic/t/s_scan_remainer_lock.test diff --git a/storage/eloq/mysql-test/mono_basic/t/secondary_key.test b/storage/eloq/mysql-test/eloq_basic/t/secondary_key.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/secondary_key.test rename to storage/eloq/mysql-test/eloq_basic/t/secondary_key.test diff --git a/storage/eloq/mysql-test/mono_basic/t/select_for_update_and_share.cnf b/storage/eloq/mysql-test/eloq_basic/t/select_for_update_and_share.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/select_for_update_and_share.cnf rename to storage/eloq/mysql-test/eloq_basic/t/select_for_update_and_share.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/select_for_update_and_share.test b/storage/eloq/mysql-test/eloq_basic/t/select_for_update_and_share.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/select_for_update_and_share.test rename to storage/eloq/mysql-test/eloq_basic/t/select_for_update_and_share.test diff --git a/storage/eloq/mysql-test/mono_basic/t/select_for_update_and_share_occ.cnf b/storage/eloq/mysql-test/eloq_basic/t/select_for_update_and_share_occ.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/select_for_update_and_share_occ.cnf rename to storage/eloq/mysql-test/eloq_basic/t/select_for_update_and_share_occ.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/select_for_update_and_share_occ.test b/storage/eloq/mysql-test/eloq_basic/t/select_for_update_and_share_occ.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/select_for_update_and_share_occ.test rename to storage/eloq/mysql-test/eloq_basic/t/select_for_update_and_share_occ.test diff --git a/storage/eloq/mysql-test/mono_basic/t/single_auto_increment.test b/storage/eloq/mysql-test/eloq_basic/t/single_auto_increment.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/single_auto_increment.test rename to storage/eloq/mysql-test/eloq_basic/t/single_auto_increment.test diff --git a/storage/eloq/mysql-test/mono_basic/t/single_dead_lock_check.cnf b/storage/eloq/mysql-test/eloq_basic/t/single_dead_lock_check.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/single_dead_lock_check.cnf rename to storage/eloq/mysql-test/eloq_basic/t/single_dead_lock_check.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/single_dead_lock_check.test b/storage/eloq/mysql-test/eloq_basic/t/single_dead_lock_check.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/single_dead_lock_check.test rename to storage/eloq/mysql-test/eloq_basic/t/single_dead_lock_check.test diff --git a/storage/eloq/mysql-test/mono_basic/t/single_node.cnf b/storage/eloq/mysql-test/eloq_basic/t/single_node.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/single_node.cnf rename to storage/eloq/mysql-test/eloq_basic/t/single_node.cnf diff --git a/storage/eloq/mysql-test/mono_basic/t/single_node.test b/storage/eloq/mysql-test/eloq_basic/t/single_node.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/single_node.test rename to storage/eloq/mysql-test/eloq_basic/t/single_node.test diff --git a/storage/eloq/mysql-test/mono_basic/t/statistics.test b/storage/eloq/mysql-test/eloq_basic/t/statistics.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/statistics.test rename to storage/eloq/mysql-test/eloq_basic/t/statistics.test diff --git a/storage/eloq/mysql-test/mono_basic/t/temporary_table.test b/storage/eloq/mysql-test/eloq_basic/t/temporary_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/temporary_table.test rename to storage/eloq/mysql-test/eloq_basic/t/temporary_table.test diff --git a/storage/eloq/mysql-test/mono_basic/t/unique_sk_lookup.test b/storage/eloq/mysql-test/eloq_basic/t/unique_sk_lookup.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/unique_sk_lookup.test rename to storage/eloq/mysql-test/eloq_basic/t/unique_sk_lookup.test diff --git a/storage/eloq/mysql-test/mono_basic/t/unsupported_sql.test b/storage/eloq/mysql-test/eloq_basic/t/unsupported_sql.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/unsupported_sql.test rename to storage/eloq/mysql-test/eloq_basic/t/unsupported_sql.test diff --git a/storage/eloq/mysql-test/mono_basic/t/update_record_with_sk.test b/storage/eloq/mysql-test/eloq_basic/t/update_record_with_sk.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/update_record_with_sk.test rename to storage/eloq/mysql-test/eloq_basic/t/update_record_with_sk.test diff --git a/storage/eloq/mysql-test/mono_basic/t/upsert_table_recovery.test b/storage/eloq/mysql-test/eloq_basic/t/upsert_table_recovery.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/upsert_table_recovery.test rename to storage/eloq/mysql-test/eloq_basic/t/upsert_table_recovery.test diff --git a/storage/eloq/mysql-test/mono_basic/t/write_log_unknown.test b/storage/eloq/mysql-test/eloq_basic/t/write_log_unknown.test similarity index 100% rename from storage/eloq/mysql-test/mono_basic/t/write_log_unknown.test rename to storage/eloq/mysql-test/eloq_basic/t/write_log_unknown.test diff --git a/storage/eloq/mysql-test/mono_main/disabled.def b/storage/eloq/mysql-test/eloq_main/disabled.def similarity index 100% rename from storage/eloq/mysql-test/mono_main/disabled.def rename to storage/eloq/mysql-test/eloq_main/disabled.def diff --git a/storage/eloq/mysql-test/mono_main/include/bytes_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/bytes_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/bytes_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/bytes_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/common-tests_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/common-tests_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/common-tests_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/common-tests_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_czech_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_czech_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_czech_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_czech_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_eloq_like.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_eloq_like.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_eloq_like.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_eloq_like.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_filesort_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_filesort_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_filesort_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_filesort_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_like_cond_propagation_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_like_cond_propagation_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_like_cond_propagation_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_like_cond_propagation_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_like_ignorable_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_like_ignorable_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_like_ignorable_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_like_ignorable_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_like_range_f1f2_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_like_range_f1f2_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_like_range_f1f2_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_like_range_f1f2_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_like_range_mdev14350_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_like_range_mdev14350_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_like_range_mdev14350_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_like_range_mdev14350_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_myanmar_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_myanmar_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_myanmar_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_myanmar_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_numconv_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_numconv_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_numconv_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_numconv_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_pad_all_engines_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_pad_all_engines_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_pad_all_engines_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_pad_all_engines_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_thai_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_thai_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_thai_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_thai_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_unescape_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_unescape_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_unescape_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_unescape_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ctype_utf8_ilseq_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ctype_utf8_ilseq_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ctype_utf8_ilseq_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ctype_utf8_ilseq_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/dbt3_s001_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/dbt3_s001_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/dbt3_s001_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/dbt3_s001_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/default_charset_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/default_charset_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/default_charset_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/default_charset_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/equal_fields_propagation_datetime_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/equal_fields_propagation_datetime_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/equal_fields_propagation_datetime_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/equal_fields_propagation_datetime_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/func_hybrid_type_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/func_hybrid_type_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/func_hybrid_type_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/func_hybrid_type_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/func_str_ascii_checksum_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/func_str_ascii_checksum_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/func_str_ascii_checksum_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/func_str_ascii_checksum_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/function_defaults_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/function_defaults_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/function_defaults_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/function_defaults_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/function_defaults_notembedded_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/function_defaults_notembedded_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/function_defaults_notembedded_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/function_defaults_notembedded_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/have_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/have_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/have_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/have_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/have_utf8mb4_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/have_utf8mb4_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/have_utf8mb4_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/have_utf8mb4_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/ipv6_clients_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/ipv6_clients_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/ipv6_clients_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/ipv6_clients_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/mrr_tests_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/mrr_tests_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/mrr_tests_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/mrr_tests_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/mysqldump_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/mysqldump_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/mysqldump_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/mysqldump_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/query_cache_sql_prepare_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/query_cache_sql_prepare_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/query_cache_sql_prepare_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/query_cache_sql_prepare_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/switch_to_mysql_global_priv_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/switch_to_mysql_global_priv_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/switch_to_mysql_global_priv_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/switch_to_mysql_global_priv_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/switch_to_mysql_user_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/switch_to_mysql_user_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/switch_to_mysql_user_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/switch_to_mysql_user_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/type_hrtime_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/type_hrtime_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/type_hrtime_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/type_hrtime_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/type_temporal_zero_default_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/type_temporal_zero_default_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/type_temporal_zero_default_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/type_temporal_zero_default_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/update_use_source_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/update_use_source_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/update_use_source_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/update_use_source_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/world_schema_eloq.inc b/storage/eloq/mysql-test/eloq_main/include/world_schema_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/world_schema_eloq.inc rename to storage/eloq/mysql-test/eloq_main/include/world_schema_eloq.inc diff --git a/storage/eloq/mysql-test/mono_main/include/world_schema_eloq1.inc b/storage/eloq/mysql-test/eloq_main/include/world_schema_eloq1.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/world_schema_eloq1.inc rename to storage/eloq/mysql-test/eloq_main/include/world_schema_eloq1.inc diff --git a/storage/eloq/mysql-test/mono_main/include/world_schema_eloq2.inc b/storage/eloq/mysql-test/eloq_main/include/world_schema_eloq2.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/include/world_schema_eloq2.inc rename to storage/eloq/mysql-test/eloq_main/include/world_schema_eloq2.inc diff --git a/storage/eloq/mysql-test/mono_main/my.cnf b/storage/eloq/mysql-test/eloq_main/my.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_main/my.cnf rename to storage/eloq/mysql-test/eloq_main/my.cnf diff --git a/storage/eloq/mysql-test/mono_main/r/1st.result b/storage/eloq/mysql-test/eloq_main/r/1st.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/1st.result rename to storage/eloq/mysql-test/eloq_main/r/1st.result diff --git a/storage/eloq/mysql-test/mono_main/r/aborted_clients.result b/storage/eloq/mysql-test/eloq_main/r/aborted_clients.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/aborted_clients.result rename to storage/eloq/mysql-test/eloq_main/r/aborted_clients.result diff --git a/storage/eloq/mysql-test/mono_main/r/adddate_454.result b/storage/eloq/mysql-test/eloq_main/r/adddate_454.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/adddate_454.result rename to storage/eloq/mysql-test/eloq_main/r/adddate_454.result diff --git a/storage/eloq/mysql-test/mono_main/r/alias.result b/storage/eloq/mysql-test/eloq_main/r/alias.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alias.result rename to storage/eloq/mysql-test/eloq_main/r/alias.result diff --git a/storage/eloq/mysql-test/mono_main/r/almost_full.result b/storage/eloq/mysql-test/eloq_main/r/almost_full.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/almost_full.result rename to storage/eloq/mysql-test/eloq_main/r/almost_full.result diff --git a/storage/eloq/mysql-test/mono_main/r/alter_events.result b/storage/eloq/mysql-test/eloq_main/r/alter_events.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_events.result rename to storage/eloq/mysql-test/eloq_main/r/alter_events.result diff --git a/storage/eloq/mysql-test/mono_main/r/alter_table,aria.rdiff b/storage/eloq/mysql-test/eloq_main/r/alter_table,aria.rdiff similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_table,aria.rdiff rename to storage/eloq/mysql-test/eloq_main/r/alter_table,aria.rdiff diff --git a/storage/eloq/mysql-test/mono_main/r/alter_table,heap.rdiff b/storage/eloq/mysql-test/eloq_main/r/alter_table,heap.rdiff similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_table,heap.rdiff rename to storage/eloq/mysql-test/eloq_main/r/alter_table,heap.rdiff diff --git a/storage/eloq/mysql-test/mono_main/r/alter_table-big.result b/storage/eloq/mysql-test/eloq_main/r/alter_table-big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_table-big.result rename to storage/eloq/mysql-test/eloq_main/r/alter_table-big.result diff --git a/storage/eloq/mysql-test/mono_main/r/alter_table.result b/storage/eloq/mysql-test/eloq_main/r/alter_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_table.result rename to storage/eloq/mysql-test/eloq_main/r/alter_table.result diff --git a/storage/eloq/mysql-test/mono_main/r/alter_table_autoinc-5574.result b/storage/eloq/mysql-test/eloq_main/r/alter_table_autoinc-5574.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_table_autoinc-5574.result rename to storage/eloq/mysql-test/eloq_main/r/alter_table_autoinc-5574.result diff --git a/storage/eloq/mysql-test/mono_main/r/alter_table_debug.result b/storage/eloq/mysql-test/eloq_main/r/alter_table_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_table_debug.result rename to storage/eloq/mysql-test/eloq_main/r/alter_table_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/alter_table_errors.result b/storage/eloq/mysql-test/eloq_main/r/alter_table_errors.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_table_errors.result rename to storage/eloq/mysql-test/eloq_main/r/alter_table_errors.result diff --git a/storage/eloq/mysql-test/mono_main/r/alter_table_mdev539_maria.result b/storage/eloq/mysql-test/eloq_main/r/alter_table_mdev539_maria.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_table_mdev539_maria.result rename to storage/eloq/mysql-test/eloq_main/r/alter_table_mdev539_maria.result diff --git a/storage/eloq/mysql-test/mono_main/r/alter_table_mdev539_myisam.result b/storage/eloq/mysql-test/eloq_main/r/alter_table_mdev539_myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_table_mdev539_myisam.result rename to storage/eloq/mysql-test/eloq_main/r/alter_table_mdev539_myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/alter_table_online.result b/storage/eloq/mysql-test/eloq_main/r/alter_table_online.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_table_online.result rename to storage/eloq/mysql-test/eloq_main/r/alter_table_online.result diff --git a/storage/eloq/mysql-test/mono_main/r/alter_table_trans.result b/storage/eloq/mysql-test/eloq_main/r/alter_table_trans.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_table_trans.result rename to storage/eloq/mysql-test/eloq_main/r/alter_table_trans.result diff --git a/storage/eloq/mysql-test/mono_main/r/alter_user.result b/storage/eloq/mysql-test/eloq_main/r/alter_user.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/alter_user.result rename to storage/eloq/mysql-test/eloq_main/r/alter_user.result diff --git a/storage/eloq/mysql-test/mono_main/r/analyze.result b/storage/eloq/mysql-test/eloq_main/r/analyze.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/analyze.result rename to storage/eloq/mysql-test/eloq_main/r/analyze.result diff --git a/storage/eloq/mysql-test/mono_main/r/analyze_debug.result b/storage/eloq/mysql-test/eloq_main/r/analyze_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/analyze_debug.result rename to storage/eloq/mysql-test/eloq_main/r/analyze_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/analyze_format_json.result b/storage/eloq/mysql-test/eloq_main/r/analyze_format_json.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/analyze_format_json.result rename to storage/eloq/mysql-test/eloq_main/r/analyze_format_json.result diff --git a/storage/eloq/mysql-test/mono_main/r/analyze_stmt.result b/storage/eloq/mysql-test/eloq_main/r/analyze_stmt.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/analyze_stmt.result rename to storage/eloq/mysql-test/eloq_main/r/analyze_stmt.result diff --git a/storage/eloq/mysql-test/mono_main/r/analyze_stmt_orderby.result b/storage/eloq/mysql-test/eloq_main/r/analyze_stmt_orderby.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/analyze_stmt_orderby.result rename to storage/eloq/mysql-test/eloq_main/r/analyze_stmt_orderby.result diff --git a/storage/eloq/mysql-test/mono_main/r/analyze_stmt_privileges.result b/storage/eloq/mysql-test/eloq_main/r/analyze_stmt_privileges.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/analyze_stmt_privileges.result rename to storage/eloq/mysql-test/eloq_main/r/analyze_stmt_privileges.result diff --git a/storage/eloq/mysql-test/mono_main/r/analyze_stmt_privileges2.result b/storage/eloq/mysql-test/eloq_main/r/analyze_stmt_privileges2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/analyze_stmt_privileges2.result rename to storage/eloq/mysql-test/eloq_main/r/analyze_stmt_privileges2.result diff --git a/storage/eloq/mysql-test/mono_main/r/analyze_stmt_slow_query_log.result b/storage/eloq/mysql-test/eloq_main/r/analyze_stmt_slow_query_log.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/analyze_stmt_slow_query_log.result rename to storage/eloq/mysql-test/eloq_main/r/analyze_stmt_slow_query_log.result diff --git a/storage/eloq/mysql-test/mono_main/r/ansi.result b/storage/eloq/mysql-test/eloq_main/r/ansi.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ansi.result rename to storage/eloq/mysql-test/eloq_main/r/ansi.result diff --git a/storage/eloq/mysql-test/mono_main/r/aria_icp_debug.result b/storage/eloq/mysql-test/eloq_main/r/aria_icp_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/aria_icp_debug.result rename to storage/eloq/mysql-test/eloq_main/r/aria_icp_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/assign_key_cache.result b/storage/eloq/mysql-test/eloq_main/r/assign_key_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/assign_key_cache.result rename to storage/eloq/mysql-test/eloq_main/r/assign_key_cache.result diff --git a/storage/eloq/mysql-test/mono_main/r/assign_key_cache_debug.result b/storage/eloq/mysql-test/eloq_main/r/assign_key_cache_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/assign_key_cache_debug.result rename to storage/eloq/mysql-test/eloq_main/r/assign_key_cache_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/auth_named_pipe.result b/storage/eloq/mysql-test/eloq_main/r/auth_named_pipe.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/auth_named_pipe.result rename to storage/eloq/mysql-test/eloq_main/r/auth_named_pipe.result diff --git a/storage/eloq/mysql-test/mono_main/r/auth_rpl.result b/storage/eloq/mysql-test/eloq_main/r/auth_rpl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/auth_rpl.result rename to storage/eloq/mysql-test/eloq_main/r/auth_rpl.result diff --git a/storage/eloq/mysql-test/mono_main/r/auto_increment.result b/storage/eloq/mysql-test/eloq_main/r/auto_increment.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/auto_increment.result rename to storage/eloq/mysql-test/eloq_main/r/auto_increment.result diff --git a/storage/eloq/mysql-test/mono_main/r/auto_increment_ranges_innodb.result b/storage/eloq/mysql-test/eloq_main/r/auto_increment_ranges_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/auto_increment_ranges_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/auto_increment_ranges_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/auto_increment_ranges_myisam.result b/storage/eloq/mysql-test/eloq_main/r/auto_increment_ranges_myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/auto_increment_ranges_myisam.result rename to storage/eloq/mysql-test/eloq_main/r/auto_increment_ranges_myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/backup_aria.result b/storage/eloq/mysql-test/eloq_main/r/backup_aria.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/backup_aria.result rename to storage/eloq/mysql-test/eloq_main/r/backup_aria.result diff --git a/storage/eloq/mysql-test/mono_main/r/backup_interaction.result b/storage/eloq/mysql-test/eloq_main/r/backup_interaction.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/backup_interaction.result rename to storage/eloq/mysql-test/eloq_main/r/backup_interaction.result diff --git a/storage/eloq/mysql-test/mono_main/r/backup_lock.result b/storage/eloq/mysql-test/eloq_main/r/backup_lock.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/backup_lock.result rename to storage/eloq/mysql-test/eloq_main/r/backup_lock.result diff --git a/storage/eloq/mysql-test/mono_main/r/backup_lock_binlog.result b/storage/eloq/mysql-test/eloq_main/r/backup_lock_binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/backup_lock_binlog.result rename to storage/eloq/mysql-test/eloq_main/r/backup_lock_binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/backup_lock_debug.result b/storage/eloq/mysql-test/eloq_main/r/backup_lock_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/backup_lock_debug.result rename to storage/eloq/mysql-test/eloq_main/r/backup_lock_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/backup_locks.result b/storage/eloq/mysql-test/eloq_main/r/backup_locks.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/backup_locks.result rename to storage/eloq/mysql-test/eloq_main/r/backup_locks.result diff --git a/storage/eloq/mysql-test/mono_main/r/backup_log.result b/storage/eloq/mysql-test/eloq_main/r/backup_log.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/backup_log.result rename to storage/eloq/mysql-test/eloq_main/r/backup_log.result diff --git a/storage/eloq/mysql-test/mono_main/r/backup_priv.result b/storage/eloq/mysql-test/eloq_main/r/backup_priv.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/backup_priv.result rename to storage/eloq/mysql-test/eloq_main/r/backup_priv.result diff --git a/storage/eloq/mysql-test/mono_main/r/backup_stages.result b/storage/eloq/mysql-test/eloq_main/r/backup_stages.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/backup_stages.result rename to storage/eloq/mysql-test/eloq_main/r/backup_stages.result diff --git a/storage/eloq/mysql-test/mono_main/r/backup_syntax.result b/storage/eloq/mysql-test/eloq_main/r/backup_syntax.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/backup_syntax.result rename to storage/eloq/mysql-test/eloq_main/r/backup_syntax.result diff --git a/storage/eloq/mysql-test/mono_main/r/bad_frm_crash_5029.result b/storage/eloq/mysql-test/eloq_main/r/bad_frm_crash_5029.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bad_frm_crash_5029.result rename to storage/eloq/mysql-test/eloq_main/r/bad_frm_crash_5029.result diff --git a/storage/eloq/mysql-test/mono_main/r/bench_count_distinct.result b/storage/eloq/mysql-test/eloq_main/r/bench_count_distinct.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bench_count_distinct.result rename to storage/eloq/mysql-test/eloq_main/r/bench_count_distinct.result diff --git a/storage/eloq/mysql-test/mono_main/r/bigint.result b/storage/eloq/mysql-test/eloq_main/r/bigint.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bigint.result rename to storage/eloq/mysql-test/eloq_main/r/bigint.result diff --git a/storage/eloq/mysql-test/mono_main/r/binary.result b/storage/eloq/mysql-test/eloq_main/r/binary.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/binary.result rename to storage/eloq/mysql-test/eloq_main/r/binary.result diff --git a/storage/eloq/mysql-test/mono_main/r/binary_to_hex.result b/storage/eloq/mysql-test/eloq_main/r/binary_to_hex.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/binary_to_hex.result rename to storage/eloq/mysql-test/eloq_main/r/binary_to_hex.result diff --git a/storage/eloq/mysql-test/mono_main/r/bind_address_resolution.result b/storage/eloq/mysql-test/eloq_main/r/bind_address_resolution.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bind_address_resolution.result rename to storage/eloq/mysql-test/eloq_main/r/bind_address_resolution.result diff --git a/storage/eloq/mysql-test/mono_main/r/blackhole.result b/storage/eloq/mysql-test/eloq_main/r/blackhole.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/blackhole.result rename to storage/eloq/mysql-test/eloq_main/r/blackhole.result diff --git a/storage/eloq/mysql-test/mono_main/r/blackhole_plugin.result b/storage/eloq/mysql-test/eloq_main/r/blackhole_plugin.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/blackhole_plugin.result rename to storage/eloq/mysql-test/eloq_main/r/blackhole_plugin.result diff --git a/storage/eloq/mysql-test/mono_main/r/bool.result b/storage/eloq/mysql-test/eloq_main/r/bool.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bool.result rename to storage/eloq/mysql-test/eloq_main/r/bool.result diff --git a/storage/eloq/mysql-test/mono_main/r/bootstrap.result b/storage/eloq/mysql-test/eloq_main/r/bootstrap.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bootstrap.result rename to storage/eloq/mysql-test/eloq_main/r/bootstrap.result diff --git a/storage/eloq/mysql-test/mono_main/r/bootstrap_innodb.result b/storage/eloq/mysql-test/eloq_main/r/bootstrap_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bootstrap_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/bootstrap_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/brackets.result b/storage/eloq/mysql-test/eloq_main/r/brackets.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/brackets.result rename to storage/eloq/mysql-test/eloq_main/r/brackets.result diff --git a/storage/eloq/mysql-test/mono_main/r/bug12427262.result b/storage/eloq/mysql-test/eloq_main/r/bug12427262.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bug12427262.result rename to storage/eloq/mysql-test/eloq_main/r/bug12427262.result diff --git a/storage/eloq/mysql-test/mono_main/r/bug13633383.result b/storage/eloq/mysql-test/eloq_main/r/bug13633383.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bug13633383.result rename to storage/eloq/mysql-test/eloq_main/r/bug13633383.result diff --git a/storage/eloq/mysql-test/mono_main/r/bug39022.result b/storage/eloq/mysql-test/eloq_main/r/bug39022.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bug39022.result rename to storage/eloq/mysql-test/eloq_main/r/bug39022.result diff --git a/storage/eloq/mysql-test/mono_main/r/bug46760.result b/storage/eloq/mysql-test/eloq_main/r/bug46760.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bug46760.result rename to storage/eloq/mysql-test/eloq_main/r/bug46760.result diff --git a/storage/eloq/mysql-test/mono_main/r/bug47671.result b/storage/eloq/mysql-test/eloq_main/r/bug47671.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bug47671.result rename to storage/eloq/mysql-test/eloq_main/r/bug47671.result diff --git a/storage/eloq/mysql-test/mono_main/r/bug58669.result b/storage/eloq/mysql-test/eloq_main/r/bug58669.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bug58669.result rename to storage/eloq/mysql-test/eloq_main/r/bug58669.result diff --git a/storage/eloq/mysql-test/mono_main/r/bulk_replace.result b/storage/eloq/mysql-test/eloq_main/r/bulk_replace.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/bulk_replace.result rename to storage/eloq/mysql-test/eloq_main/r/bulk_replace.result diff --git a/storage/eloq/mysql-test/mono_main/r/cache_innodb.result b/storage/eloq/mysql-test/eloq_main/r/cache_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/cache_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/cache_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/cache_temporal_4265.result b/storage/eloq/mysql-test/eloq_main/r/cache_temporal_4265.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/cache_temporal_4265.result rename to storage/eloq/mysql-test/eloq_main/r/cache_temporal_4265.result diff --git a/storage/eloq/mysql-test/mono_main/r/case.result b/storage/eloq/mysql-test/eloq_main/r/case.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/case.result rename to storage/eloq/mysql-test/eloq_main/r/case.result diff --git a/storage/eloq/mysql-test/mono_main/r/cast.result b/storage/eloq/mysql-test/eloq_main/r/cast.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/cast.result rename to storage/eloq/mysql-test/eloq_main/r/cast.result diff --git a/storage/eloq/mysql-test/mono_main/r/change_user.result b/storage/eloq/mysql-test/eloq_main/r/change_user.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/change_user.result rename to storage/eloq/mysql-test/eloq_main/r/change_user.result diff --git a/storage/eloq/mysql-test/mono_main/r/change_user_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/change_user_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/change_user_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/change_user_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/charset_client_win.result b/storage/eloq/mysql-test/eloq_main/r/charset_client_win.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/charset_client_win.result rename to storage/eloq/mysql-test/eloq_main/r/charset_client_win.result diff --git a/storage/eloq/mysql-test/mono_main/r/check.result b/storage/eloq/mysql-test/eloq_main/r/check.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/check.result rename to storage/eloq/mysql-test/eloq_main/r/check.result diff --git a/storage/eloq/mysql-test/mono_main/r/check_constraint.result b/storage/eloq/mysql-test/eloq_main/r/check_constraint.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/check_constraint.result rename to storage/eloq/mysql-test/eloq_main/r/check_constraint.result diff --git a/storage/eloq/mysql-test/mono_main/r/check_constraint_innodb.result b/storage/eloq/mysql-test/eloq_main/r/check_constraint_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/check_constraint_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/check_constraint_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/check_constraint_show.result b/storage/eloq/mysql-test/eloq_main/r/check_constraint_show.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/check_constraint_show.result rename to storage/eloq/mysql-test/eloq_main/r/check_constraint_show.result diff --git a/storage/eloq/mysql-test/mono_main/r/cli_options_force_protocol_not_win.result b/storage/eloq/mysql-test/eloq_main/r/cli_options_force_protocol_not_win.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/cli_options_force_protocol_not_win.result rename to storage/eloq/mysql-test/eloq_main/r/cli_options_force_protocol_not_win.result diff --git a/storage/eloq/mysql-test/mono_main/r/cli_options_force_protocol_win.result b/storage/eloq/mysql-test/eloq_main/r/cli_options_force_protocol_win.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/cli_options_force_protocol_win.result rename to storage/eloq/mysql-test/eloq_main/r/cli_options_force_protocol_win.result diff --git a/storage/eloq/mysql-test/mono_main/r/client_xml.result b/storage/eloq/mysql-test/eloq_main/r/client_xml.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/client_xml.result rename to storage/eloq/mysql-test/eloq_main/r/client_xml.result diff --git a/storage/eloq/mysql-test/mono_main/r/column_compression.result b/storage/eloq/mysql-test/eloq_main/r/column_compression.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/column_compression.result rename to storage/eloq/mysql-test/eloq_main/r/column_compression.result diff --git a/storage/eloq/mysql-test/mono_main/r/column_compression_parts.result b/storage/eloq/mysql-test/eloq_main/r/column_compression_parts.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/column_compression_parts.result rename to storage/eloq/mysql-test/eloq_main/r/column_compression_parts.result diff --git a/storage/eloq/mysql-test/mono_main/r/column_compression_rpl.result b/storage/eloq/mysql-test/eloq_main/r/column_compression_rpl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/column_compression_rpl.result rename to storage/eloq/mysql-test/eloq_main/r/column_compression_rpl.result diff --git a/storage/eloq/mysql-test/mono_main/r/column_compression_utf16.result b/storage/eloq/mysql-test/eloq_main/r/column_compression_utf16.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/column_compression_utf16.result rename to storage/eloq/mysql-test/eloq_main/r/column_compression_utf16.result diff --git a/storage/eloq/mysql-test/mono_main/r/comment_column.result b/storage/eloq/mysql-test/eloq_main/r/comment_column.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/comment_column.result rename to storage/eloq/mysql-test/eloq_main/r/comment_column.result diff --git a/storage/eloq/mysql-test/mono_main/r/comment_column2.result b/storage/eloq/mysql-test/eloq_main/r/comment_column2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/comment_column2.result rename to storage/eloq/mysql-test/eloq_main/r/comment_column2.result diff --git a/storage/eloq/mysql-test/mono_main/r/comment_database.result b/storage/eloq/mysql-test/eloq_main/r/comment_database.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/comment_database.result rename to storage/eloq/mysql-test/eloq_main/r/comment_database.result diff --git a/storage/eloq/mysql-test/mono_main/r/comment_index.result b/storage/eloq/mysql-test/eloq_main/r/comment_index.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/comment_index.result rename to storage/eloq/mysql-test/eloq_main/r/comment_index.result diff --git a/storage/eloq/mysql-test/mono_main/r/comment_table.result b/storage/eloq/mysql-test/eloq_main/r/comment_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/comment_table.result rename to storage/eloq/mysql-test/eloq_main/r/comment_table.result diff --git a/storage/eloq/mysql-test/mono_main/r/comments.result b/storage/eloq/mysql-test/eloq_main/r/comments.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/comments.result rename to storage/eloq/mysql-test/eloq_main/r/comments.result diff --git a/storage/eloq/mysql-test/mono_main/r/commit.result b/storage/eloq/mysql-test/eloq_main/r/commit.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/commit.result rename to storage/eloq/mysql-test/eloq_main/r/commit.result diff --git a/storage/eloq/mysql-test/mono_main/r/commit_1innodb.result b/storage/eloq/mysql-test/eloq_main/r/commit_1innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/commit_1innodb.result rename to storage/eloq/mysql-test/eloq_main/r/commit_1innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/compare.result b/storage/eloq/mysql-test/eloq_main/r/compare.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/compare.result rename to storage/eloq/mysql-test/eloq_main/r/compare.result diff --git a/storage/eloq/mysql-test/mono_main/r/compound.result b/storage/eloq/mysql-test/eloq_main/r/compound.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/compound.result rename to storage/eloq/mysql-test/eloq_main/r/compound.result diff --git a/storage/eloq/mysql-test/mono_main/r/compress.result b/storage/eloq/mysql-test/eloq_main/r/compress.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/compress.result rename to storage/eloq/mysql-test/eloq_main/r/compress.result diff --git a/storage/eloq/mysql-test/mono_main/r/concurrent_innodb_safelog.result b/storage/eloq/mysql-test/eloq_main/r/concurrent_innodb_safelog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/concurrent_innodb_safelog.result rename to storage/eloq/mysql-test/eloq_main/r/concurrent_innodb_safelog.result diff --git a/storage/eloq/mysql-test/mono_main/r/concurrent_innodb_unsafelog.result b/storage/eloq/mysql-test/eloq_main/r/concurrent_innodb_unsafelog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/concurrent_innodb_unsafelog.result rename to storage/eloq/mysql-test/eloq_main/r/concurrent_innodb_unsafelog.result diff --git a/storage/eloq/mysql-test/mono_main/r/connect-abstract.result b/storage/eloq/mysql-test/eloq_main/r/connect-abstract.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/connect-abstract.result rename to storage/eloq/mysql-test/eloq_main/r/connect-abstract.result diff --git a/storage/eloq/mysql-test/mono_main/r/connect.result b/storage/eloq/mysql-test/eloq_main/r/connect.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/connect.result rename to storage/eloq/mysql-test/eloq_main/r/connect.result diff --git a/storage/eloq/mysql-test/mono_main/r/connect2.result b/storage/eloq/mysql-test/eloq_main/r/connect2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/connect2.result rename to storage/eloq/mysql-test/eloq_main/r/connect2.result diff --git a/storage/eloq/mysql-test/mono_main/r/connect_debug.result b/storage/eloq/mysql-test/eloq_main/r/connect_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/connect_debug.result rename to storage/eloq/mysql-test/eloq_main/r/connect_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/consistent_snapshot.result b/storage/eloq/mysql-test/eloq_main/r/consistent_snapshot.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/consistent_snapshot.result rename to storage/eloq/mysql-test/eloq_main/r/consistent_snapshot.result diff --git a/storage/eloq/mysql-test/mono_main/r/constraints.result b/storage/eloq/mysql-test/eloq_main/r/constraints.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/constraints.result rename to storage/eloq/mysql-test/eloq_main/r/constraints.result diff --git a/storage/eloq/mysql-test/mono_main/r/contributors.result b/storage/eloq/mysql-test/eloq_main/r/contributors.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/contributors.result rename to storage/eloq/mysql-test/eloq_main/r/contributors.result diff --git a/storage/eloq/mysql-test/mono_main/r/count_distinct.result b/storage/eloq/mysql-test/eloq_main/r/count_distinct.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/count_distinct.result rename to storage/eloq/mysql-test/eloq_main/r/count_distinct.result diff --git a/storage/eloq/mysql-test/mono_main/r/count_distinct2.result b/storage/eloq/mysql-test/eloq_main/r/count_distinct2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/count_distinct2.result rename to storage/eloq/mysql-test/eloq_main/r/count_distinct2.result diff --git a/storage/eloq/mysql-test/mono_main/r/count_distinct3.result b/storage/eloq/mysql-test/eloq_main/r/count_distinct3.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/count_distinct3.result rename to storage/eloq/mysql-test/eloq_main/r/count_distinct3.result diff --git a/storage/eloq/mysql-test/mono_main/r/crash_commit_before.result b/storage/eloq/mysql-test/eloq_main/r/crash_commit_before.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/crash_commit_before.result rename to storage/eloq/mysql-test/eloq_main/r/crash_commit_before.result diff --git a/storage/eloq/mysql-test/mono_main/r/create-big.result b/storage/eloq/mysql-test/eloq_main/r/create-big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create-big.result rename to storage/eloq/mysql-test/eloq_main/r/create-big.result diff --git a/storage/eloq/mysql-test/mono_main/r/create-uca.result b/storage/eloq/mysql-test/eloq_main/r/create-uca.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create-uca.result rename to storage/eloq/mysql-test/eloq_main/r/create-uca.result diff --git a/storage/eloq/mysql-test/mono_main/r/create.result b/storage/eloq/mysql-test/eloq_main/r/create.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create.result rename to storage/eloq/mysql-test/eloq_main/r/create.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_delayed.result b/storage/eloq/mysql-test/eloq_main/r/create_delayed.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_delayed.result rename to storage/eloq/mysql-test/eloq_main/r/create_delayed.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_binlog.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_binlog.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_db.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_db.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_db.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_db.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_event.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_event.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_event.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_event.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_function.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_function.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_function.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_function.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_index.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_index.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_index.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_index.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_procedure.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_procedure.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_procedure.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_procedure.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_role.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_role.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_role.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_role.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_server.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_server.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_server.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_server.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_trigger.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_trigger.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_trigger.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_trigger.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_udf.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_udf.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_udf.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_udf.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_user.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_user.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_user.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_user.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_drop_view.result b/storage/eloq/mysql-test/eloq_main/r/create_drop_view.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_drop_view.result rename to storage/eloq/mysql-test/eloq_main/r/create_drop_view.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_not_windows.result b/storage/eloq/mysql-test/eloq_main/r/create_not_windows.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_not_windows.result rename to storage/eloq/mysql-test/eloq_main/r/create_not_windows.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_or_replace.result b/storage/eloq/mysql-test/eloq_main/r/create_or_replace.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_or_replace.result rename to storage/eloq/mysql-test/eloq_main/r/create_or_replace.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_or_replace2.result b/storage/eloq/mysql-test/eloq_main/r/create_or_replace2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_or_replace2.result rename to storage/eloq/mysql-test/eloq_main/r/create_or_replace2.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_or_replace_permission.result b/storage/eloq/mysql-test/eloq_main/r/create_or_replace_permission.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_or_replace_permission.result rename to storage/eloq/mysql-test/eloq_main/r/create_or_replace_permission.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_replace_tmp.result b/storage/eloq/mysql-test/eloq_main/r/create_replace_tmp.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_replace_tmp.result rename to storage/eloq/mysql-test/eloq_main/r/create_replace_tmp.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_select_tmp.result b/storage/eloq/mysql-test/eloq_main/r/create_select_tmp.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_select_tmp.result rename to storage/eloq/mysql-test/eloq_main/r/create_select_tmp.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_user.result b/storage/eloq/mysql-test/eloq_main/r/create_user.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_user.result rename to storage/eloq/mysql-test/eloq_main/r/create_user.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_utf8.result b/storage/eloq/mysql-test/eloq_main/r/create_utf8.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_utf8.result rename to storage/eloq/mysql-test/eloq_main/r/create_utf8.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_w_max_indexes_128.result b/storage/eloq/mysql-test/eloq_main/r/create_w_max_indexes_128.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_w_max_indexes_128.result rename to storage/eloq/mysql-test/eloq_main/r/create_w_max_indexes_128.result diff --git a/storage/eloq/mysql-test/mono_main/r/create_w_max_indexes_64.result b/storage/eloq/mysql-test/eloq_main/r/create_w_max_indexes_64.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/create_w_max_indexes_64.result rename to storage/eloq/mysql-test/eloq_main/r/create_w_max_indexes_64.result diff --git a/storage/eloq/mysql-test/mono_main/r/cte_cycle.result b/storage/eloq/mysql-test/eloq_main/r/cte_cycle.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/cte_cycle.result rename to storage/eloq/mysql-test/eloq_main/r/cte_cycle.result diff --git a/storage/eloq/mysql-test/mono_main/r/cte_grant.result b/storage/eloq/mysql-test/eloq_main/r/cte_grant.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/cte_grant.result rename to storage/eloq/mysql-test/eloq_main/r/cte_grant.result diff --git a/storage/eloq/mysql-test/mono_main/r/cte_nonrecursive.result b/storage/eloq/mysql-test/eloq_main/r/cte_nonrecursive.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/cte_nonrecursive.result rename to storage/eloq/mysql-test/eloq_main/r/cte_nonrecursive.result diff --git a/storage/eloq/mysql-test/mono_main/r/cte_nonrecursive_not_embedded.result b/storage/eloq/mysql-test/eloq_main/r/cte_nonrecursive_not_embedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/cte_nonrecursive_not_embedded.result rename to storage/eloq/mysql-test/eloq_main/r/cte_nonrecursive_not_embedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/cte_recursive.result b/storage/eloq/mysql-test/eloq_main/r/cte_recursive.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/cte_recursive.result rename to storage/eloq/mysql-test/eloq_main/r/cte_recursive.result diff --git a/storage/eloq/mysql-test/mono_main/r/cte_recursive_not_embedded.result b/storage/eloq/mysql-test/eloq_main/r/cte_recursive_not_embedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/cte_recursive_not_embedded.result rename to storage/eloq/mysql-test/eloq_main/r/cte_recursive_not_embedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_ascii.result b/storage/eloq/mysql-test/eloq_main/r/ctype_ascii.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_ascii.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_ascii.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_big5.result b/storage/eloq/mysql-test/eloq_main/r/ctype_big5.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_big5.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_big5.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_binary.result b/storage/eloq/mysql-test/eloq_main/r/ctype_binary.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_binary.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_binary.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_collate.result b/storage/eloq/mysql-test/eloq_main/r/ctype_collate.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_collate.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_collate.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_cp1250_ch.result b/storage/eloq/mysql-test/eloq_main/r/ctype_cp1250_ch.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_cp1250_ch.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_cp1250_ch.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_cp1251.result b/storage/eloq/mysql-test/eloq_main/r/ctype_cp1251.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_cp1251.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_cp1251.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_cp850.result b/storage/eloq/mysql-test/eloq_main/r/ctype_cp850.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_cp850.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_cp850.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_cp932.result b/storage/eloq/mysql-test/eloq_main/r/ctype_cp932.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_cp932.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_cp932.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_cp932_binlog_row.result b/storage/eloq/mysql-test/eloq_main/r/ctype_cp932_binlog_row.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_cp932_binlog_row.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_cp932_binlog_row.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_cp932_binlog_stm.result b/storage/eloq/mysql-test/eloq_main/r/ctype_cp932_binlog_stm.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_cp932_binlog_stm.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_cp932_binlog_stm.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_create.result b/storage/eloq/mysql-test/eloq_main/r/ctype_create.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_create.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_create.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_dec8.result b/storage/eloq/mysql-test/eloq_main/r/ctype_dec8.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_dec8.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_dec8.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_errors.result b/storage/eloq/mysql-test/eloq_main/r/ctype_errors.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_errors.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_errors.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_eucjpms.result b/storage/eloq/mysql-test/eloq_main/r/ctype_eucjpms.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_eucjpms.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_eucjpms.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_euckr.result b/storage/eloq/mysql-test/eloq_main/r/ctype_euckr.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_euckr.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_euckr.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_filename.result b/storage/eloq/mysql-test/eloq_main/r/ctype_filename.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_filename.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_filename.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_filesystem.result b/storage/eloq/mysql-test/eloq_main/r/ctype_filesystem.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_filesystem.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_filesystem.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_gb2312.result b/storage/eloq/mysql-test/eloq_main/r/ctype_gb2312.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_gb2312.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_gb2312.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_gbk.result b/storage/eloq/mysql-test/eloq_main/r/ctype_gbk.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_gbk.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_gbk.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_gbk_binlog.result b/storage/eloq/mysql-test/eloq_main/r/ctype_gbk_binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_gbk_binlog.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_gbk_binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_gbk_export_import.result b/storage/eloq/mysql-test/eloq_main/r/ctype_gbk_export_import.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_gbk_export_import.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_gbk_export_import.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_hebrew.result b/storage/eloq/mysql-test/eloq_main/r/ctype_hebrew.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_hebrew.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_hebrew.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_latin1.result b/storage/eloq/mysql-test/eloq_main/r/ctype_latin1.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_latin1.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_latin1.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_latin1_de.result b/storage/eloq/mysql-test/eloq_main/r/ctype_latin1_de.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_latin1_de.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_latin1_de.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_latin2.result b/storage/eloq/mysql-test/eloq_main/r/ctype_latin2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_latin2.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_latin2.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_latin2_ch.result b/storage/eloq/mysql-test/eloq_main/r/ctype_latin2_ch.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_latin2_ch.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_latin2_ch.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_ldml.result b/storage/eloq/mysql-test/eloq_main/r/ctype_ldml.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_ldml.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_ldml.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_like_range.result b/storage/eloq/mysql-test/eloq_main/r/ctype_like_range.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_like_range.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_like_range.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_many.result b/storage/eloq/mysql-test/eloq_main/r/ctype_many.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_many.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_many.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_mb.result b/storage/eloq/mysql-test/eloq_main/r/ctype_mb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_mb.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_mb.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_nopad_8bit.result b/storage/eloq/mysql-test/eloq_main/r/ctype_nopad_8bit.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_nopad_8bit.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_nopad_8bit.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_partitions.result b/storage/eloq/mysql-test/eloq_main/r/ctype_partitions.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_partitions.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_partitions.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_recoding.result b/storage/eloq/mysql-test/eloq_main/r/ctype_recoding.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_recoding.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_recoding.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_sjis.result b/storage/eloq/mysql-test/eloq_main/r/ctype_sjis.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_sjis.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_sjis.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_swe7.result b/storage/eloq/mysql-test/eloq_main/r/ctype_swe7.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_swe7.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_swe7.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_tis620.result b/storage/eloq/mysql-test/eloq_main/r/ctype_tis620.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_tis620.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_tis620.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_uca.result b/storage/eloq/mysql-test/eloq_main/r/ctype_uca.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_uca.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_uca.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_uca_innodb.result b/storage/eloq/mysql-test/eloq_main/r/ctype_uca_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_uca_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_uca_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_uca_partitions.result b/storage/eloq/mysql-test/eloq_main/r/ctype_uca_partitions.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_uca_partitions.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_uca_partitions.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_ucs.result b/storage/eloq/mysql-test/eloq_main/r/ctype_ucs.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_ucs.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_ucs.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_ucs2_def.result b/storage/eloq/mysql-test/eloq_main/r/ctype_ucs2_def.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_ucs2_def.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_ucs2_def.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_ucs2_query_cache.result b/storage/eloq/mysql-test/eloq_main/r/ctype_ucs2_query_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_ucs2_query_cache.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_ucs2_query_cache.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_ucs2_uca.result b/storage/eloq/mysql-test/eloq_main/r/ctype_ucs2_uca.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_ucs2_uca.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_ucs2_uca.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_ujis.result b/storage/eloq/mysql-test/eloq_main/r/ctype_ujis.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_ujis.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_ujis.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_ujis_ucs2.result b/storage/eloq/mysql-test/eloq_main/r/ctype_ujis_ucs2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_ujis_ucs2.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_ujis_ucs2.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_upgrade.result b/storage/eloq/mysql-test/eloq_main/r/ctype_upgrade.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_upgrade.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_upgrade.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf16.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf16.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf16.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf16.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf16_def.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf16_def.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf16_def.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf16_def.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf16_uca.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf16_uca.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf16_uca.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf16_uca.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf16le.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf16le.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf16le.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf16le.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf32.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf32.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf32.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf32.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf32_def.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf32_def.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf32_def.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf32_def.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf32_uca.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf32_uca.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf32_uca.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf32_uca.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf8.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf8.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf8.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf8.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf8_def_upgrade.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf8_def_upgrade.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf8_def_upgrade.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf8_def_upgrade.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf8_uca.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf8_uca.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf8_uca.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf8_uca.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf8mb4.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf8mb4.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf8mb4.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf8mb4.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf8mb4_heap.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf8mb4_heap.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf8mb4_heap.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf8mb4_heap.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf8mb4_innodb.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf8mb4_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf8mb4_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf8mb4_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf8mb4_myisam.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf8mb4_myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf8mb4_myisam.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf8mb4_myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/ctype_utf8mb4_uca.result b/storage/eloq/mysql-test/eloq_main/r/ctype_utf8mb4_uca.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ctype_utf8mb4_uca.result rename to storage/eloq/mysql-test/eloq_main/r/ctype_utf8mb4_uca.result diff --git a/storage/eloq/mysql-test/mono_main/r/custom_aggregate_functions.result b/storage/eloq/mysql-test/eloq_main/r/custom_aggregate_functions.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/custom_aggregate_functions.result rename to storage/eloq/mysql-test/eloq_main/r/custom_aggregate_functions.result diff --git a/storage/eloq/mysql-test/mono_main/r/custom_aggregates_i_s.result b/storage/eloq/mysql-test/eloq_main/r/custom_aggregates_i_s.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/custom_aggregates_i_s.result rename to storage/eloq/mysql-test/eloq_main/r/custom_aggregates_i_s.result diff --git a/storage/eloq/mysql-test/mono_main/r/date_formats.result b/storage/eloq/mysql-test/eloq_main/r/date_formats.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/date_formats.result rename to storage/eloq/mysql-test/eloq_main/r/date_formats.result diff --git a/storage/eloq/mysql-test/mono_main/r/datetime_456.result b/storage/eloq/mysql-test/eloq_main/r/datetime_456.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/datetime_456.result rename to storage/eloq/mysql-test/eloq_main/r/datetime_456.result diff --git a/storage/eloq/mysql-test/mono_main/r/ddl_i18n_koi8r.result b/storage/eloq/mysql-test/eloq_main/r/ddl_i18n_koi8r.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ddl_i18n_koi8r.result rename to storage/eloq/mysql-test/eloq_main/r/ddl_i18n_koi8r.result diff --git a/storage/eloq/mysql-test/mono_main/r/ddl_i18n_utf8.result b/storage/eloq/mysql-test/eloq_main/r/ddl_i18n_utf8.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ddl_i18n_utf8.result rename to storage/eloq/mysql-test/eloq_main/r/ddl_i18n_utf8.result diff --git a/storage/eloq/mysql-test/mono_main/r/deadlock_ftwrl.result b/storage/eloq/mysql-test/eloq_main/r/deadlock_ftwrl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/deadlock_ftwrl.result rename to storage/eloq/mysql-test/eloq_main/r/deadlock_ftwrl.result diff --git a/storage/eloq/mysql-test/mono_main/r/deadlock_innodb.result b/storage/eloq/mysql-test/eloq_main/r/deadlock_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/deadlock_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/deadlock_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/debug_sync.result b/storage/eloq/mysql-test/eloq_main/r/debug_sync.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/debug_sync.result rename to storage/eloq/mysql-test/eloq_main/r/debug_sync.result diff --git a/storage/eloq/mysql-test/mono_main/r/default.result b/storage/eloq/mysql-test/eloq_main/r/default.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/default.result rename to storage/eloq/mysql-test/eloq_main/r/default.result diff --git a/storage/eloq/mysql-test/mono_main/r/default_debug.result b/storage/eloq/mysql-test/eloq_main/r/default_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/default_debug.result rename to storage/eloq/mysql-test/eloq_main/r/default_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/default_session.result b/storage/eloq/mysql-test/eloq_main/r/default_session.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/default_session.result rename to storage/eloq/mysql-test/eloq_main/r/default_session.result diff --git a/storage/eloq/mysql-test/mono_main/r/default_storage_engine.result b/storage/eloq/mysql-test/eloq_main/r/default_storage_engine.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/default_storage_engine.result rename to storage/eloq/mysql-test/eloq_main/r/default_storage_engine.result diff --git a/storage/eloq/mysql-test/mono_main/r/delayed.result b/storage/eloq/mysql-test/eloq_main/r/delayed.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/delayed.result rename to storage/eloq/mysql-test/eloq_main/r/delayed.result diff --git a/storage/eloq/mysql-test/mono_main/r/delayed_blob.result b/storage/eloq/mysql-test/eloq_main/r/delayed_blob.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/delayed_blob.result rename to storage/eloq/mysql-test/eloq_main/r/delayed_blob.result diff --git a/storage/eloq/mysql-test/mono_main/r/delete.result b/storage/eloq/mysql-test/eloq_main/r/delete.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/delete.result rename to storage/eloq/mysql-test/eloq_main/r/delete.result diff --git a/storage/eloq/mysql-test/mono_main/r/delete_innodb.result b/storage/eloq/mysql-test/eloq_main/r/delete_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/delete_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/delete_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/delete_returning.result b/storage/eloq/mysql-test/eloq_main/r/delete_returning.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/delete_returning.result rename to storage/eloq/mysql-test/eloq_main/r/delete_returning.result diff --git a/storage/eloq/mysql-test/mono_main/r/delete_returning_grant.result b/storage/eloq/mysql-test/eloq_main/r/delete_returning_grant.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/delete_returning_grant.result rename to storage/eloq/mysql-test/eloq_main/r/delete_returning_grant.result diff --git a/storage/eloq/mysql-test/mono_main/r/delete_use_source.result b/storage/eloq/mysql-test/eloq_main/r/delete_use_source.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/delete_use_source.result rename to storage/eloq/mysql-test/eloq_main/r/delete_use_source.result diff --git a/storage/eloq/mysql-test/mono_main/r/delimiter_command_case_sensitivity.result b/storage/eloq/mysql-test/eloq_main/r/delimiter_command_case_sensitivity.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/delimiter_command_case_sensitivity.result rename to storage/eloq/mysql-test/eloq_main/r/delimiter_command_case_sensitivity.result diff --git a/storage/eloq/mysql-test/mono_main/r/deprecated_features.result b/storage/eloq/mysql-test/eloq_main/r/deprecated_features.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/deprecated_features.result rename to storage/eloq/mysql-test/eloq_main/r/deprecated_features.result diff --git a/storage/eloq/mysql-test/mono_main/r/derived.result b/storage/eloq/mysql-test/eloq_main/r/derived.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/derived.result rename to storage/eloq/mysql-test/eloq_main/r/derived.result diff --git a/storage/eloq/mysql-test/mono_main/r/derived_cond_pushdown.result b/storage/eloq/mysql-test/eloq_main/r/derived_cond_pushdown.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/derived_cond_pushdown.result rename to storage/eloq/mysql-test/eloq_main/r/derived_cond_pushdown.result diff --git a/storage/eloq/mysql-test/mono_main/r/derived_opt.result b/storage/eloq/mysql-test/eloq_main/r/derived_opt.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/derived_opt.result rename to storage/eloq/mysql-test/eloq_main/r/derived_opt.result diff --git a/storage/eloq/mysql-test/mono_main/r/derived_split_innodb.result b/storage/eloq/mysql-test/eloq_main/r/derived_split_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/derived_split_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/derived_split_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/derived_view.result b/storage/eloq/mysql-test/eloq_main/r/derived_view.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/derived_view.result rename to storage/eloq/mysql-test/eloq_main/r/derived_view.result diff --git a/storage/eloq/mysql-test/mono_main/r/dirty_close.result b/storage/eloq/mysql-test/eloq_main/r/dirty_close.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/dirty_close.result rename to storage/eloq/mysql-test/eloq_main/r/dirty_close.result diff --git a/storage/eloq/mysql-test/mono_main/r/distinct.result b/storage/eloq/mysql-test/eloq_main/r/distinct.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/distinct.result rename to storage/eloq/mysql-test/eloq_main/r/distinct.result diff --git a/storage/eloq/mysql-test/mono_main/r/drop.result b/storage/eloq/mysql-test/eloq_main/r/drop.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/drop.result rename to storage/eloq/mysql-test/eloq_main/r/drop.result diff --git a/storage/eloq/mysql-test/mono_main/r/drop_bad_db_type.result b/storage/eloq/mysql-test/eloq_main/r/drop_bad_db_type.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/drop_bad_db_type.result rename to storage/eloq/mysql-test/eloq_main/r/drop_bad_db_type.result diff --git a/storage/eloq/mysql-test/mono_main/r/drop_combinations.result b/storage/eloq/mysql-test/eloq_main/r/drop_combinations.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/drop_combinations.result rename to storage/eloq/mysql-test/eloq_main/r/drop_combinations.result diff --git a/storage/eloq/mysql-test/mono_main/r/drop_table_force.result b/storage/eloq/mysql-test/eloq_main/r/drop_table_force.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/drop_table_force.result rename to storage/eloq/mysql-test/eloq_main/r/drop_table_force.result diff --git a/storage/eloq/mysql-test/mono_main/r/dyncol.result b/storage/eloq/mysql-test/eloq_main/r/dyncol.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/dyncol.result rename to storage/eloq/mysql-test/eloq_main/r/dyncol.result diff --git a/storage/eloq/mysql-test/mono_main/r/empty_server_name-8224.result b/storage/eloq/mysql-test/eloq_main/r/empty_server_name-8224.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/empty_server_name-8224.result rename to storage/eloq/mysql-test/eloq_main/r/empty_server_name-8224.result diff --git a/storage/eloq/mysql-test/mono_main/r/empty_string_literal.result b/storage/eloq/mysql-test/eloq_main/r/empty_string_literal.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/empty_string_literal.result rename to storage/eloq/mysql-test/eloq_main/r/empty_string_literal.result diff --git a/storage/eloq/mysql-test/mono_main/r/empty_table.result b/storage/eloq/mysql-test/eloq_main/r/empty_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/empty_table.result rename to storage/eloq/mysql-test/eloq_main/r/empty_table.result diff --git a/storage/eloq/mysql-test/mono_main/r/empty_user_table.result b/storage/eloq/mysql-test/eloq_main/r/empty_user_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/empty_user_table.result rename to storage/eloq/mysql-test/eloq_main/r/empty_user_table.result diff --git a/storage/eloq/mysql-test/mono_main/r/endspace.result b/storage/eloq/mysql-test/eloq_main/r/endspace.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/endspace.result rename to storage/eloq/mysql-test/eloq_main/r/endspace.result diff --git a/storage/eloq/mysql-test/mono_main/r/enforce_storage_engine.result b/storage/eloq/mysql-test/eloq_main/r/enforce_storage_engine.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/enforce_storage_engine.result rename to storage/eloq/mysql-test/eloq_main/r/enforce_storage_engine.result diff --git a/storage/eloq/mysql-test/mono_main/r/enforce_storage_engine_opt.result b/storage/eloq/mysql-test/eloq_main/r/enforce_storage_engine_opt.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/enforce_storage_engine_opt.result rename to storage/eloq/mysql-test/eloq_main/r/enforce_storage_engine_opt.result diff --git a/storage/eloq/mysql-test/mono_main/r/engine_error_in_alter-8453.result b/storage/eloq/mysql-test/eloq_main/r/engine_error_in_alter-8453.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/engine_error_in_alter-8453.result rename to storage/eloq/mysql-test/eloq_main/r/engine_error_in_alter-8453.result diff --git a/storage/eloq/mysql-test/mono_main/r/error_simulation.result b/storage/eloq/mysql-test/eloq_main/r/error_simulation.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/error_simulation.result rename to storage/eloq/mysql-test/eloq_main/r/error_simulation.result diff --git a/storage/eloq/mysql-test/mono_main/r/errors.result b/storage/eloq/mysql-test/eloq_main/r/errors.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/errors.result rename to storage/eloq/mysql-test/eloq_main/r/errors.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_1.result b/storage/eloq/mysql-test/eloq_main/r/events_1.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_1.result rename to storage/eloq/mysql-test/eloq_main/r/events_1.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_2.result b/storage/eloq/mysql-test/eloq_main/r/events_2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_2.result rename to storage/eloq/mysql-test/eloq_main/r/events_2.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_bugs.result b/storage/eloq/mysql-test/eloq_main/r/events_bugs.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_bugs.result rename to storage/eloq/mysql-test/eloq_main/r/events_bugs.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_embedded.result b/storage/eloq/mysql-test/eloq_main/r/events_embedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_embedded.result rename to storage/eloq/mysql-test/eloq_main/r/events_embedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_grant.result b/storage/eloq/mysql-test/eloq_main/r/events_grant.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_grant.result rename to storage/eloq/mysql-test/eloq_main/r/events_grant.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_logs_tests.result b/storage/eloq/mysql-test/eloq_main/r/events_logs_tests.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_logs_tests.result rename to storage/eloq/mysql-test/eloq_main/r/events_logs_tests.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_microsec.result b/storage/eloq/mysql-test/eloq_main/r/events_microsec.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_microsec.result rename to storage/eloq/mysql-test/eloq_main/r/events_microsec.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_restart.result b/storage/eloq/mysql-test/eloq_main/r/events_restart.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_restart.result rename to storage/eloq/mysql-test/eloq_main/r/events_restart.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_scheduling.result b/storage/eloq/mysql-test/eloq_main/r/events_scheduling.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_scheduling.result rename to storage/eloq/mysql-test/eloq_main/r/events_scheduling.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_slowlog.result b/storage/eloq/mysql-test/eloq_main/r/events_slowlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_slowlog.result rename to storage/eloq/mysql-test/eloq_main/r/events_slowlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_stress.result b/storage/eloq/mysql-test/eloq_main/r/events_stress.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_stress.result rename to storage/eloq/mysql-test/eloq_main/r/events_stress.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_time_zone.result b/storage/eloq/mysql-test/eloq_main/r/events_time_zone.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_time_zone.result rename to storage/eloq/mysql-test/eloq_main/r/events_time_zone.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_trans.result b/storage/eloq/mysql-test/eloq_main/r/events_trans.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_trans.result rename to storage/eloq/mysql-test/eloq_main/r/events_trans.result diff --git a/storage/eloq/mysql-test/mono_main/r/events_trans_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/events_trans_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/events_trans_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/events_trans_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/except.result b/storage/eloq/mysql-test/eloq_main/r/except.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/except.result rename to storage/eloq/mysql-test/eloq_main/r/except.result diff --git a/storage/eloq/mysql-test/mono_main/r/except_all.result b/storage/eloq/mysql-test/eloq_main/r/except_all.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/except_all.result rename to storage/eloq/mysql-test/eloq_main/r/except_all.result diff --git a/storage/eloq/mysql-test/mono_main/r/execution_constants.result b/storage/eloq/mysql-test/eloq_main/r/execution_constants.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/execution_constants.result rename to storage/eloq/mysql-test/eloq_main/r/execution_constants.result diff --git a/storage/eloq/mysql-test/mono_main/r/explain.result b/storage/eloq/mysql-test/eloq_main/r/explain.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/explain.result rename to storage/eloq/mysql-test/eloq_main/r/explain.result diff --git a/storage/eloq/mysql-test/mono_main/r/explain_json.result b/storage/eloq/mysql-test/eloq_main/r/explain_json.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/explain_json.result rename to storage/eloq/mysql-test/eloq_main/r/explain_json.result diff --git a/storage/eloq/mysql-test/mono_main/r/explain_json_format_partitions.result b/storage/eloq/mysql-test/eloq_main/r/explain_json_format_partitions.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/explain_json_format_partitions.result rename to storage/eloq/mysql-test/eloq_main/r/explain_json_format_partitions.result diff --git a/storage/eloq/mysql-test/mono_main/r/explain_json_innodb.result b/storage/eloq/mysql-test/eloq_main/r/explain_json_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/explain_json_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/explain_json_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/explain_non_select.result b/storage/eloq/mysql-test/eloq_main/r/explain_non_select.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/explain_non_select.result rename to storage/eloq/mysql-test/eloq_main/r/explain_non_select.result diff --git a/storage/eloq/mysql-test/mono_main/r/explain_slowquerylog.result b/storage/eloq/mysql-test/eloq_main/r/explain_slowquerylog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/explain_slowquerylog.result rename to storage/eloq/mysql-test/eloq_main/r/explain_slowquerylog.result diff --git a/storage/eloq/mysql-test/mono_main/r/ext_key_noPK_6794.result b/storage/eloq/mysql-test/eloq_main/r/ext_key_noPK_6794.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ext_key_noPK_6794.result rename to storage/eloq/mysql-test/eloq_main/r/ext_key_noPK_6794.result diff --git a/storage/eloq/mysql-test/mono_main/r/failed_auth_3909.result b/storage/eloq/mysql-test/eloq_main/r/failed_auth_3909.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/failed_auth_3909.result rename to storage/eloq/mysql-test/eloq_main/r/failed_auth_3909.result diff --git a/storage/eloq/mysql-test/mono_main/r/failed_auth_unixsocket.result b/storage/eloq/mysql-test/eloq_main/r/failed_auth_unixsocket.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/failed_auth_unixsocket.result rename to storage/eloq/mysql-test/eloq_main/r/failed_auth_unixsocket.result diff --git a/storage/eloq/mysql-test/mono_main/r/fast_prefix_index_fetch_innodb.result b/storage/eloq/mysql-test/eloq_main/r/fast_prefix_index_fetch_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fast_prefix_index_fetch_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/fast_prefix_index_fetch_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/features,ps.rdiff b/storage/eloq/mysql-test/eloq_main/r/features,ps.rdiff similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/features,ps.rdiff rename to storage/eloq/mysql-test/eloq_main/r/features,ps.rdiff diff --git a/storage/eloq/mysql-test/mono_main/r/features.result b/storage/eloq/mysql-test/eloq_main/r/features.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/features.result rename to storage/eloq/mysql-test/eloq_main/r/features.result diff --git a/storage/eloq/mysql-test/mono_main/r/fetch_first.result b/storage/eloq/mysql-test/eloq_main/r/fetch_first.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fetch_first.result rename to storage/eloq/mysql-test/eloq_main/r/fetch_first.result diff --git a/storage/eloq/mysql-test/mono_main/r/file_contents.result b/storage/eloq/mysql-test/eloq_main/r/file_contents.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/file_contents.result rename to storage/eloq/mysql-test/eloq_main/r/file_contents.result diff --git a/storage/eloq/mysql-test/mono_main/r/filesort_bad_i_s-7585.result b/storage/eloq/mysql-test/eloq_main/r/filesort_bad_i_s-7585.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/filesort_bad_i_s-7585.result rename to storage/eloq/mysql-test/eloq_main/r/filesort_bad_i_s-7585.result diff --git a/storage/eloq/mysql-test/mono_main/r/filesort_debug.result b/storage/eloq/mysql-test/eloq_main/r/filesort_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/filesort_debug.result rename to storage/eloq/mysql-test/eloq_main/r/filesort_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/fix_priv_tables.result b/storage/eloq/mysql-test/eloq_main/r/fix_priv_tables.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fix_priv_tables.result rename to storage/eloq/mysql-test/eloq_main/r/fix_priv_tables.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush-innodb-notembedded.result b/storage/eloq/mysql-test/eloq_main/r/flush-innodb-notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush-innodb-notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/flush-innodb-notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush-innodb.result b/storage/eloq/mysql-test/eloq_main/r/flush-innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush-innodb.result rename to storage/eloq/mysql-test/eloq_main/r/flush-innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush.result b/storage/eloq/mysql-test/eloq_main/r/flush.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush.result rename to storage/eloq/mysql-test/eloq_main/r/flush.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush2.result b/storage/eloq/mysql-test/eloq_main/r/flush2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush2.result rename to storage/eloq/mysql-test/eloq_main/r/flush2.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush_and_binlog.result b/storage/eloq/mysql-test/eloq_main/r/flush_and_binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush_and_binlog.result rename to storage/eloq/mysql-test/eloq_main/r/flush_and_binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush_block_commit.result b/storage/eloq/mysql-test/eloq_main/r/flush_block_commit.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush_block_commit.result rename to storage/eloq/mysql-test/eloq_main/r/flush_block_commit.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush_block_commit_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/flush_block_commit_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush_block_commit_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/flush_block_commit_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush_logs_not_windows.result b/storage/eloq/mysql-test/eloq_main/r/flush_logs_not_windows.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush_logs_not_windows.result rename to storage/eloq/mysql-test/eloq_main/r/flush_logs_not_windows.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/flush_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/flush_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush_read_lock.result b/storage/eloq/mysql-test/eloq_main/r/flush_read_lock.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush_read_lock.result rename to storage/eloq/mysql-test/eloq_main/r/flush_read_lock.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush_read_lock_kill.result b/storage/eloq/mysql-test/eloq_main/r/flush_read_lock_kill.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush_read_lock_kill.result rename to storage/eloq/mysql-test/eloq_main/r/flush_read_lock_kill.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush_ssl.result b/storage/eloq/mysql-test/eloq_main/r/flush_ssl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush_ssl.result rename to storage/eloq/mysql-test/eloq_main/r/flush_ssl.result diff --git a/storage/eloq/mysql-test/mono_main/r/flush_table.result b/storage/eloq/mysql-test/eloq_main/r/flush_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/flush_table.result rename to storage/eloq/mysql-test/eloq_main/r/flush_table.result diff --git a/storage/eloq/mysql-test/mono_main/r/foreign_key.result b/storage/eloq/mysql-test/eloq_main/r/foreign_key.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/foreign_key.result rename to storage/eloq/mysql-test/eloq_main/r/foreign_key.result diff --git a/storage/eloq/mysql-test/mono_main/r/frm-debug.result b/storage/eloq/mysql-test/eloq_main/r/frm-debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/frm-debug.result rename to storage/eloq/mysql-test/eloq_main/r/frm-debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/frm_bad_row_type-7333.result b/storage/eloq/mysql-test/eloq_main/r/frm_bad_row_type-7333.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/frm_bad_row_type-7333.result rename to storage/eloq/mysql-test/eloq_main/r/frm_bad_row_type-7333.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext.result b/storage/eloq/mysql-test/eloq_main/r/fulltext.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext2.result b/storage/eloq/mysql-test/eloq_main/r/fulltext2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext2.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext2.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext3.result b/storage/eloq/mysql-test/eloq_main/r/fulltext3.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext3.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext3.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext_cache.result b/storage/eloq/mysql-test/eloq_main/r/fulltext_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext_cache.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext_cache.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext_charsets.result b/storage/eloq/mysql-test/eloq_main/r/fulltext_charsets.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext_charsets.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext_charsets.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext_derived_4257.result b/storage/eloq/mysql-test/eloq_main/r/fulltext_derived_4257.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext_derived_4257.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext_derived_4257.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext_derived_4316.result b/storage/eloq/mysql-test/eloq_main/r/fulltext_derived_4316.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext_derived_4316.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext_derived_4316.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext_distinct.result b/storage/eloq/mysql-test/eloq_main/r/fulltext_distinct.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext_distinct.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext_distinct.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext_left_join.result b/storage/eloq/mysql-test/eloq_main/r/fulltext_left_join.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext_left_join.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext_left_join.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext_multi.result b/storage/eloq/mysql-test/eloq_main/r/fulltext_multi.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext_multi.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext_multi.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext_order_by.result b/storage/eloq/mysql-test/eloq_main/r/fulltext_order_by.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext_order_by.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext_order_by.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext_update.result b/storage/eloq/mysql-test/eloq_main/r/fulltext_update.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext_update.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext_update.result diff --git a/storage/eloq/mysql-test/mono_main/r/fulltext_var.result b/storage/eloq/mysql-test/eloq_main/r/fulltext_var.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/fulltext_var.result rename to storage/eloq/mysql-test/eloq_main/r/fulltext_var.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_analyse.result b/storage/eloq/mysql-test/eloq_main/r/func_analyse.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_analyse.result rename to storage/eloq/mysql-test/eloq_main/r/func_analyse.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_bit.result b/storage/eloq/mysql-test/eloq_main/r/func_bit.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_bit.result rename to storage/eloq/mysql-test/eloq_main/r/func_bit.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_compress.result b/storage/eloq/mysql-test/eloq_main/r/func_compress.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_compress.result rename to storage/eloq/mysql-test/eloq_main/r/func_compress.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_concat.result b/storage/eloq/mysql-test/eloq_main/r/func_concat.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_concat.result rename to storage/eloq/mysql-test/eloq_main/r/func_concat.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_crypt.result b/storage/eloq/mysql-test/eloq_main/r/func_crypt.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_crypt.result rename to storage/eloq/mysql-test/eloq_main/r/func_crypt.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_date_add.result b/storage/eloq/mysql-test/eloq_main/r/func_date_add.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_date_add.result rename to storage/eloq/mysql-test/eloq_main/r/func_date_add.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_debug.result b/storage/eloq/mysql-test/eloq_main/r/func_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_debug.result rename to storage/eloq/mysql-test/eloq_main/r/func_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_default.result b/storage/eloq/mysql-test/eloq_main/r/func_default.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_default.result rename to storage/eloq/mysql-test/eloq_main/r/func_default.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_des_encrypt.result b/storage/eloq/mysql-test/eloq_main/r/func_des_encrypt.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_des_encrypt.result rename to storage/eloq/mysql-test/eloq_main/r/func_des_encrypt.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_digest.result b/storage/eloq/mysql-test/eloq_main/r/func_digest.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_digest.result rename to storage/eloq/mysql-test/eloq_main/r/func_digest.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_encrypt.result b/storage/eloq/mysql-test/eloq_main/r/func_encrypt.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_encrypt.result rename to storage/eloq/mysql-test/eloq_main/r/func_encrypt.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_encrypt_nossl.result b/storage/eloq/mysql-test/eloq_main/r/func_encrypt_nossl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_encrypt_nossl.result rename to storage/eloq/mysql-test/eloq_main/r/func_encrypt_nossl.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_encrypt_ucs2.result b/storage/eloq/mysql-test/eloq_main/r/func_encrypt_ucs2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_encrypt_ucs2.result rename to storage/eloq/mysql-test/eloq_main/r/func_encrypt_ucs2.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_equal.result b/storage/eloq/mysql-test/eloq_main/r/func_equal.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_equal.result rename to storage/eloq/mysql-test/eloq_main/r/func_equal.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_extract.result b/storage/eloq/mysql-test/eloq_main/r/func_extract.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_extract.result rename to storage/eloq/mysql-test/eloq_main/r/func_extract.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_gconcat.result b/storage/eloq/mysql-test/eloq_main/r/func_gconcat.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_gconcat.result rename to storage/eloq/mysql-test/eloq_main/r/func_gconcat.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_group.result b/storage/eloq/mysql-test/eloq_main/r/func_group.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_group.result rename to storage/eloq/mysql-test/eloq_main/r/func_group.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_group_innodb.result b/storage/eloq/mysql-test/eloq_main/r/func_group_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_group_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/func_group_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_hybrid_type.result b/storage/eloq/mysql-test/eloq_main/r/func_hybrid_type.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_hybrid_type.result rename to storage/eloq/mysql-test/eloq_main/r/func_hybrid_type.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_if.result b/storage/eloq/mysql-test/eloq_main/r/func_if.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_if.result rename to storage/eloq/mysql-test/eloq_main/r/func_if.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_in.result b/storage/eloq/mysql-test/eloq_main/r/func_in.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_in.result rename to storage/eloq/mysql-test/eloq_main/r/func_in.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_int.result b/storage/eloq/mysql-test/eloq_main/r/func_int.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_int.result rename to storage/eloq/mysql-test/eloq_main/r/func_int.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_isnull.result b/storage/eloq/mysql-test/eloq_main/r/func_isnull.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_isnull.result rename to storage/eloq/mysql-test/eloq_main/r/func_isnull.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_json.result b/storage/eloq/mysql-test/eloq_main/r/func_json.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_json.result rename to storage/eloq/mysql-test/eloq_main/r/func_json.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_like.result b/storage/eloq/mysql-test/eloq_main/r/func_like.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_like.result rename to storage/eloq/mysql-test/eloq_main/r/func_like.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_math.result b/storage/eloq/mysql-test/eloq_main/r/func_math.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_math.result rename to storage/eloq/mysql-test/eloq_main/r/func_math.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_misc.result b/storage/eloq/mysql-test/eloq_main/r/func_misc.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_misc.result rename to storage/eloq/mysql-test/eloq_main/r/func_misc.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_op.result b/storage/eloq/mysql-test/eloq_main/r/func_op.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_op.result rename to storage/eloq/mysql-test/eloq_main/r/func_op.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_regexp.result b/storage/eloq/mysql-test/eloq_main/r/func_regexp.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_regexp.result rename to storage/eloq/mysql-test/eloq_main/r/func_regexp.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_regexp_pcre.result b/storage/eloq/mysql-test/eloq_main/r/func_regexp_pcre.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_regexp_pcre.result rename to storage/eloq/mysql-test/eloq_main/r/func_regexp_pcre.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_regexp_pcre_debug.result b/storage/eloq/mysql-test/eloq_main/r/func_regexp_pcre_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_regexp_pcre_debug.result rename to storage/eloq/mysql-test/eloq_main/r/func_regexp_pcre_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_rollback.result b/storage/eloq/mysql-test/eloq_main/r/func_rollback.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_rollback.result rename to storage/eloq/mysql-test/eloq_main/r/func_rollback.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_sapdb.result b/storage/eloq/mysql-test/eloq_main/r/func_sapdb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_sapdb.result rename to storage/eloq/mysql-test/eloq_main/r/func_sapdb.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_set.result b/storage/eloq/mysql-test/eloq_main/r/func_set.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_set.result rename to storage/eloq/mysql-test/eloq_main/r/func_set.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_str.result b/storage/eloq/mysql-test/eloq_main/r/func_str.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_str.result rename to storage/eloq/mysql-test/eloq_main/r/func_str.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_system.result b/storage/eloq/mysql-test/eloq_main/r/func_system.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_system.result rename to storage/eloq/mysql-test/eloq_main/r/func_system.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_test.result b/storage/eloq/mysql-test/eloq_main/r/func_test.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_test.result rename to storage/eloq/mysql-test/eloq_main/r/func_test.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_time.result b/storage/eloq/mysql-test/eloq_main/r/func_time.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_time.result rename to storage/eloq/mysql-test/eloq_main/r/func_time.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_time_hires.result b/storage/eloq/mysql-test/eloq_main/r/func_time_hires.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_time_hires.result rename to storage/eloq/mysql-test/eloq_main/r/func_time_hires.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_time_round.result b/storage/eloq/mysql-test/eloq_main/r/func_time_round.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_time_round.result rename to storage/eloq/mysql-test/eloq_main/r/func_time_round.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_timestamp.result b/storage/eloq/mysql-test/eloq_main/r/func_timestamp.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_timestamp.result rename to storage/eloq/mysql-test/eloq_main/r/func_timestamp.result diff --git a/storage/eloq/mysql-test/mono_main/r/func_weight_string.result b/storage/eloq/mysql-test/eloq_main/r/func_weight_string.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/func_weight_string.result rename to storage/eloq/mysql-test/eloq_main/r/func_weight_string.result diff --git a/storage/eloq/mysql-test/mono_main/r/function_defaults.result b/storage/eloq/mysql-test/eloq_main/r/function_defaults.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/function_defaults.result rename to storage/eloq/mysql-test/eloq_main/r/function_defaults.result diff --git a/storage/eloq/mysql-test/mono_main/r/function_defaults_innodb.result b/storage/eloq/mysql-test/eloq_main/r/function_defaults_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/function_defaults_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/function_defaults_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/function_defaults_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/function_defaults_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/function_defaults_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/function_defaults_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/gcc296.result b/storage/eloq/mysql-test/eloq_main/r/gcc296.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/gcc296.result rename to storage/eloq/mysql-test/eloq_main/r/gcc296.result diff --git a/storage/eloq/mysql-test/mono_main/r/get_diagnostics.result b/storage/eloq/mysql-test/eloq_main/r/get_diagnostics.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/get_diagnostics.result rename to storage/eloq/mysql-test/eloq_main/r/get_diagnostics.result diff --git a/storage/eloq/mysql-test/mono_main/r/gis-alter_table_online.result b/storage/eloq/mysql-test/eloq_main/r/gis-alter_table_online.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/gis-alter_table_online.result rename to storage/eloq/mysql-test/eloq_main/r/gis-alter_table_online.result diff --git a/storage/eloq/mysql-test/mono_main/r/gis-debug.result b/storage/eloq/mysql-test/eloq_main/r/gis-debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/gis-debug.result rename to storage/eloq/mysql-test/eloq_main/r/gis-debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/gis-json.result b/storage/eloq/mysql-test/eloq_main/r/gis-json.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/gis-json.result rename to storage/eloq/mysql-test/eloq_main/r/gis-json.result diff --git a/storage/eloq/mysql-test/mono_main/r/gis-loaddata.result b/storage/eloq/mysql-test/eloq_main/r/gis-loaddata.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/gis-loaddata.result rename to storage/eloq/mysql-test/eloq_main/r/gis-loaddata.result diff --git a/storage/eloq/mysql-test/mono_main/r/gis-precise.result b/storage/eloq/mysql-test/eloq_main/r/gis-precise.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/gis-precise.result rename to storage/eloq/mysql-test/eloq_main/r/gis-precise.result diff --git a/storage/eloq/mysql-test/mono_main/r/gis-rt-precise.result b/storage/eloq/mysql-test/eloq_main/r/gis-rt-precise.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/gis-rt-precise.result rename to storage/eloq/mysql-test/eloq_main/r/gis-rt-precise.result diff --git a/storage/eloq/mysql-test/mono_main/r/gis-rtree.result b/storage/eloq/mysql-test/eloq_main/r/gis-rtree.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/gis-rtree.result rename to storage/eloq/mysql-test/eloq_main/r/gis-rtree.result diff --git a/storage/eloq/mysql-test/mono_main/r/gis.result b/storage/eloq/mysql-test/eloq_main/r/gis.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/gis.result rename to storage/eloq/mysql-test/eloq_main/r/gis.result diff --git a/storage/eloq/mysql-test/mono_main/r/gis_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/gis_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/gis_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/gis_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant.result b/storage/eloq/mysql-test/eloq_main/r/grant.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant.result rename to storage/eloq/mysql-test/eloq_main/r/grant.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant2.result b/storage/eloq/mysql-test/eloq_main/r/grant2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant2.result rename to storage/eloq/mysql-test/eloq_main/r/grant2.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant3.result b/storage/eloq/mysql-test/eloq_main/r/grant3.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant3.result rename to storage/eloq/mysql-test/eloq_main/r/grant3.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant4.result b/storage/eloq/mysql-test/eloq_main/r/grant4.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant4.result rename to storage/eloq/mysql-test/eloq_main/r/grant4.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant5.result b/storage/eloq/mysql-test/eloq_main/r/grant5.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant5.result rename to storage/eloq/mysql-test/eloq_main/r/grant5.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_4332.result b/storage/eloq/mysql-test/eloq_main/r/grant_4332.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_4332.result rename to storage/eloq/mysql-test/eloq_main/r/grant_4332.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_binlog_replay.result b/storage/eloq/mysql-test/eloq_main/r/grant_binlog_replay.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_binlog_replay.result rename to storage/eloq/mysql-test/eloq_main/r/grant_binlog_replay.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_cache_no_prot.result b/storage/eloq/mysql-test/eloq_main/r/grant_cache_no_prot.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_cache_no_prot.result rename to storage/eloq/mysql-test/eloq_main/r/grant_cache_no_prot.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_cache_ps_prot.result b/storage/eloq/mysql-test/eloq_main/r/grant_cache_ps_prot.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_cache_ps_prot.result rename to storage/eloq/mysql-test/eloq_main/r/grant_cache_ps_prot.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_explain_non_select.result b/storage/eloq/mysql-test/eloq_main/r/grant_explain_non_select.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_explain_non_select.result rename to storage/eloq/mysql-test/eloq_main/r/grant_explain_non_select.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_kill.result b/storage/eloq/mysql-test/eloq_main/r/grant_kill.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_kill.result rename to storage/eloq/mysql-test/eloq_main/r/grant_kill.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_lowercase.result b/storage/eloq/mysql-test/eloq_main/r/grant_lowercase.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_lowercase.result rename to storage/eloq/mysql-test/eloq_main/r/grant_lowercase.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_lowercase_fs.result b/storage/eloq/mysql-test/eloq_main/r/grant_lowercase_fs.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_lowercase_fs.result rename to storage/eloq/mysql-test/eloq_main/r/grant_lowercase_fs.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_master_admin.result b/storage/eloq/mysql-test/eloq_main/r/grant_master_admin.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_master_admin.result rename to storage/eloq/mysql-test/eloq_main/r/grant_master_admin.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_not_windows.result b/storage/eloq/mysql-test/eloq_main/r/grant_not_windows.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_not_windows.result rename to storage/eloq/mysql-test/eloq_main/r/grant_not_windows.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_read_only.result b/storage/eloq/mysql-test/eloq_main/r/grant_read_only.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_read_only.result rename to storage/eloq/mysql-test/eloq_main/r/grant_read_only.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_repair.result b/storage/eloq/mysql-test/eloq_main/r/grant_repair.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_repair.result rename to storage/eloq/mysql-test/eloq_main/r/grant_repair.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_server.result b/storage/eloq/mysql-test/eloq_main/r/grant_server.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_server.result rename to storage/eloq/mysql-test/eloq_main/r/grant_server.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_slave_admin.result b/storage/eloq/mysql-test/eloq_main/r/grant_slave_admin.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_slave_admin.result rename to storage/eloq/mysql-test/eloq_main/r/grant_slave_admin.result diff --git a/storage/eloq/mysql-test/mono_main/r/grant_slave_monitor.result b/storage/eloq/mysql-test/eloq_main/r/grant_slave_monitor.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/grant_slave_monitor.result rename to storage/eloq/mysql-test/eloq_main/r/grant_slave_monitor.result diff --git a/storage/eloq/mysql-test/mono_main/r/greedy_optimizer.result b/storage/eloq/mysql-test/eloq_main/r/greedy_optimizer.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/greedy_optimizer.result rename to storage/eloq/mysql-test/eloq_main/r/greedy_optimizer.result diff --git a/storage/eloq/mysql-test/mono_main/r/group_by.result b/storage/eloq/mysql-test/eloq_main/r/group_by.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/group_by.result rename to storage/eloq/mysql-test/eloq_main/r/group_by.result diff --git a/storage/eloq/mysql-test/mono_main/r/group_by_innodb.result b/storage/eloq/mysql-test/eloq_main/r/group_by_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/group_by_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/group_by_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/group_by_null.result b/storage/eloq/mysql-test/eloq_main/r/group_by_null.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/group_by_null.result rename to storage/eloq/mysql-test/eloq_main/r/group_by_null.result diff --git a/storage/eloq/mysql-test/mono_main/r/group_min_max.result b/storage/eloq/mysql-test/eloq_main/r/group_min_max.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/group_min_max.result rename to storage/eloq/mysql-test/eloq_main/r/group_min_max.result diff --git a/storage/eloq/mysql-test/mono_main/r/group_min_max_innodb.result b/storage/eloq/mysql-test/eloq_main/r/group_min_max_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/group_min_max_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/group_min_max_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/handler_read_last.result b/storage/eloq/mysql-test/eloq_main/r/handler_read_last.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/handler_read_last.result rename to storage/eloq/mysql-test/eloq_main/r/handler_read_last.result diff --git a/storage/eloq/mysql-test/mono_main/r/handlersocket.result b/storage/eloq/mysql-test/eloq_main/r/handlersocket.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/handlersocket.result rename to storage/eloq/mysql-test/eloq_main/r/handlersocket.result diff --git a/storage/eloq/mysql-test/mono_main/r/having.result b/storage/eloq/mysql-test/eloq_main/r/having.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/having.result rename to storage/eloq/mysql-test/eloq_main/r/having.result diff --git a/storage/eloq/mysql-test/mono_main/r/having_cond_pushdown.result b/storage/eloq/mysql-test/eloq_main/r/having_cond_pushdown.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/having_cond_pushdown.result rename to storage/eloq/mysql-test/eloq_main/r/having_cond_pushdown.result diff --git a/storage/eloq/mysql-test/mono_main/r/help.result b/storage/eloq/mysql-test/eloq_main/r/help.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/help.result rename to storage/eloq/mysql-test/eloq_main/r/help.result diff --git a/storage/eloq/mysql-test/mono_main/r/host_cache_size_functionality.result b/storage/eloq/mysql-test/eloq_main/r/host_cache_size_functionality.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/host_cache_size_functionality.result rename to storage/eloq/mysql-test/eloq_main/r/host_cache_size_functionality.result diff --git a/storage/eloq/mysql-test/mono_main/r/huge_frm-6224.result b/storage/eloq/mysql-test/eloq_main/r/huge_frm-6224.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/huge_frm-6224.result rename to storage/eloq/mysql-test/eloq_main/r/huge_frm-6224.result diff --git a/storage/eloq/mysql-test/mono_main/r/ignored_index.result b/storage/eloq/mysql-test/eloq_main/r/ignored_index.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ignored_index.result rename to storage/eloq/mysql-test/eloq_main/r/ignored_index.result diff --git a/storage/eloq/mysql-test/mono_main/r/ignored_index_innodb.result b/storage/eloq/mysql-test/eloq_main/r/ignored_index_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ignored_index_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/ignored_index_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/implicit_char_to_num_conversion.result b/storage/eloq/mysql-test/eloq_main/r/implicit_char_to_num_conversion.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/implicit_char_to_num_conversion.result rename to storage/eloq/mysql-test/eloq_main/r/implicit_char_to_num_conversion.result diff --git a/storage/eloq/mysql-test/mono_main/r/implicit_commit.result b/storage/eloq/mysql-test/eloq_main/r/implicit_commit.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/implicit_commit.result rename to storage/eloq/mysql-test/eloq_main/r/implicit_commit.result diff --git a/storage/eloq/mysql-test/mono_main/r/in_datetime_241.result b/storage/eloq/mysql-test/eloq_main/r/in_datetime_241.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/in_datetime_241.result rename to storage/eloq/mysql-test/eloq_main/r/in_datetime_241.result diff --git a/storage/eloq/mysql-test/mono_main/r/in_subq_cond_pushdown.result b/storage/eloq/mysql-test/eloq_main/r/in_subq_cond_pushdown.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/in_subq_cond_pushdown.result rename to storage/eloq/mysql-test/eloq_main/r/in_subq_cond_pushdown.result diff --git a/storage/eloq/mysql-test/mono_main/r/index_intersect.result b/storage/eloq/mysql-test/eloq_main/r/index_intersect.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/index_intersect.result rename to storage/eloq/mysql-test/eloq_main/r/index_intersect.result diff --git a/storage/eloq/mysql-test/mono_main/r/index_intersect_innodb.result b/storage/eloq/mysql-test/eloq_main/r/index_intersect_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/index_intersect_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/index_intersect_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/index_merge_innodb.result b/storage/eloq/mysql-test/eloq_main/r/index_merge_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/index_merge_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/index_merge_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/index_merge_myisam.result b/storage/eloq/mysql-test/eloq_main/r/index_merge_myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/index_merge_myisam.result rename to storage/eloq/mysql-test/eloq_main/r/index_merge_myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema-big.result b/storage/eloq/mysql-test/eloq_main/r/information_schema-big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema-big.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema-big.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema.result b/storage/eloq/mysql-test/eloq_main/r/information_schema.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema2.result b/storage/eloq/mysql-test/eloq_main/r/information_schema2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema2.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema2.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema_all_engines.result b/storage/eloq/mysql-test/eloq_main/r/information_schema_all_engines.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema_all_engines.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema_all_engines.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema_chmod.result b/storage/eloq/mysql-test/eloq_main/r/information_schema_chmod.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema_chmod.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema_chmod.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema_db.result b/storage/eloq/mysql-test/eloq_main/r/information_schema_db.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema_db.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema_db.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema_inno.result b/storage/eloq/mysql-test/eloq_main/r/information_schema_inno.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema_inno.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema_inno.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema_linux.result b/storage/eloq/mysql-test/eloq_main/r/information_schema_linux.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema_linux.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema_linux.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema_parameters.result b/storage/eloq/mysql-test/eloq_main/r/information_schema_parameters.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema_parameters.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema_parameters.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema_part.result b/storage/eloq/mysql-test/eloq_main/r/information_schema_part.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema_part.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema_part.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema_prepare.result b/storage/eloq/mysql-test/eloq_main/r/information_schema_prepare.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema_prepare.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema_prepare.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema_routines.result b/storage/eloq/mysql-test/eloq_main/r/information_schema_routines.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema_routines.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema_routines.result diff --git a/storage/eloq/mysql-test/mono_main/r/information_schema_stats.result b/storage/eloq/mysql-test/eloq_main/r/information_schema_stats.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/information_schema_stats.result rename to storage/eloq/mysql-test/eloq_main/r/information_schema_stats.result diff --git a/storage/eloq/mysql-test/mono_main/r/init_connect.result b/storage/eloq/mysql-test/eloq_main/r/init_connect.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/init_connect.result rename to storage/eloq/mysql-test/eloq_main/r/init_connect.result diff --git a/storage/eloq/mysql-test/mono_main/r/init_connection_query_cache.result b/storage/eloq/mysql-test/eloq_main/r/init_connection_query_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/init_connection_query_cache.result rename to storage/eloq/mysql-test/eloq_main/r/init_connection_query_cache.result diff --git a/storage/eloq/mysql-test/mono_main/r/init_file.result b/storage/eloq/mysql-test/eloq_main/r/init_file.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/init_file.result rename to storage/eloq/mysql-test/eloq_main/r/init_file.result diff --git a/storage/eloq/mysql-test/mono_main/r/init_file_longline_3816.result b/storage/eloq/mysql-test/eloq_main/r/init_file_longline_3816.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/init_file_longline_3816.result rename to storage/eloq/mysql-test/eloq_main/r/init_file_longline_3816.result diff --git a/storage/eloq/mysql-test/mono_main/r/init_file_set_password-7656.result b/storage/eloq/mysql-test/eloq_main/r/init_file_set_password-7656.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/init_file_set_password-7656.result rename to storage/eloq/mysql-test/eloq_main/r/init_file_set_password-7656.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_bug878769.result b/storage/eloq/mysql-test/eloq_main/r/innodb_bug878769.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_bug878769.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_bug878769.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_ext_key,off.rdiff b/storage/eloq/mysql-test/eloq_main/r/innodb_ext_key,off.rdiff similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_ext_key,off.rdiff rename to storage/eloq/mysql-test/eloq_main/r/innodb_ext_key,off.rdiff diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_ext_key.result b/storage/eloq/mysql-test/eloq_main/r/innodb_ext_key.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_ext_key.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_ext_key.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_group.result b/storage/eloq/mysql-test/eloq_main/r/innodb_group.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_group.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_group.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_icp.result b/storage/eloq/mysql-test/eloq_main/r/innodb_icp.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_icp.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_icp.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_icp_debug.result b/storage/eloq/mysql-test/eloq_main/r/innodb_icp_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_icp_debug.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_icp_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_ignore_builtin.result b/storage/eloq/mysql-test/eloq_main/r/innodb_ignore_builtin.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_ignore_builtin.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_ignore_builtin.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_load_xa.result b/storage/eloq/mysql-test/eloq_main/r/innodb_load_xa.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_load_xa.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_load_xa.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_mrr_cpk.result b/storage/eloq/mysql-test/eloq_main/r/innodb_mrr_cpk.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_mrr_cpk.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_mrr_cpk.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_mysql_lock.result b/storage/eloq/mysql-test/eloq_main/r/innodb_mysql_lock.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_mysql_lock.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_mysql_lock.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_mysql_lock2.result b/storage/eloq/mysql-test/eloq_main/r/innodb_mysql_lock2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_mysql_lock2.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_mysql_lock2.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_mysql_sync.result b/storage/eloq/mysql-test/eloq_main/r/innodb_mysql_sync.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_mysql_sync.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_mysql_sync.result diff --git a/storage/eloq/mysql-test/mono_main/r/innodb_utf8.result b/storage/eloq/mysql-test/eloq_main/r/innodb_utf8.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/innodb_utf8.result rename to storage/eloq/mysql-test/eloq_main/r/innodb_utf8.result diff --git a/storage/eloq/mysql-test/mono_main/r/insert.result b/storage/eloq/mysql-test/eloq_main/r/insert.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/insert.result rename to storage/eloq/mysql-test/eloq_main/r/insert.result diff --git a/storage/eloq/mysql-test/mono_main/r/insert_debug.result b/storage/eloq/mysql-test/eloq_main/r/insert_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/insert_debug.result rename to storage/eloq/mysql-test/eloq_main/r/insert_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/insert_innodb.result b/storage/eloq/mysql-test/eloq_main/r/insert_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/insert_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/insert_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/insert_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/insert_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/insert_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/insert_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/insert_returning.result b/storage/eloq/mysql-test/eloq_main/r/insert_returning.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/insert_returning.result rename to storage/eloq/mysql-test/eloq_main/r/insert_returning.result diff --git a/storage/eloq/mysql-test/mono_main/r/insert_returning_datatypes.result b/storage/eloq/mysql-test/eloq_main/r/insert_returning_datatypes.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/insert_returning_datatypes.result rename to storage/eloq/mysql-test/eloq_main/r/insert_returning_datatypes.result diff --git a/storage/eloq/mysql-test/mono_main/r/insert_select.result b/storage/eloq/mysql-test/eloq_main/r/insert_select.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/insert_select.result rename to storage/eloq/mysql-test/eloq_main/r/insert_select.result diff --git a/storage/eloq/mysql-test/mono_main/r/insert_update.result b/storage/eloq/mysql-test/eloq_main/r/insert_update.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/insert_update.result rename to storage/eloq/mysql-test/eloq_main/r/insert_update.result diff --git a/storage/eloq/mysql-test/mono_main/r/insert_update_autoinc-7150.result b/storage/eloq/mysql-test/eloq_main/r/insert_update_autoinc-7150.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/insert_update_autoinc-7150.result rename to storage/eloq/mysql-test/eloq_main/r/insert_update_autoinc-7150.result diff --git a/storage/eloq/mysql-test/mono_main/r/intersect.result b/storage/eloq/mysql-test/eloq_main/r/intersect.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/intersect.result rename to storage/eloq/mysql-test/eloq_main/r/intersect.result diff --git a/storage/eloq/mysql-test/mono_main/r/intersect_all.result b/storage/eloq/mysql-test/eloq_main/r/intersect_all.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/intersect_all.result rename to storage/eloq/mysql-test/eloq_main/r/intersect_all.result diff --git a/storage/eloq/mysql-test/mono_main/r/invisible_binlog.result b/storage/eloq/mysql-test/eloq_main/r/invisible_binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/invisible_binlog.result rename to storage/eloq/mysql-test/eloq_main/r/invisible_binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/invisible_field.result b/storage/eloq/mysql-test/eloq_main/r/invisible_field.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/invisible_field.result rename to storage/eloq/mysql-test/eloq_main/r/invisible_field.result diff --git a/storage/eloq/mysql-test/mono_main/r/invisible_field_debug.result b/storage/eloq/mysql-test/eloq_main/r/invisible_field_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/invisible_field_debug.result rename to storage/eloq/mysql-test/eloq_main/r/invisible_field_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/invisible_field_grant_completely.result b/storage/eloq/mysql-test/eloq_main/r/invisible_field_grant_completely.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/invisible_field_grant_completely.result rename to storage/eloq/mysql-test/eloq_main/r/invisible_field_grant_completely.result diff --git a/storage/eloq/mysql-test/mono_main/r/invisible_field_grant_system.result b/storage/eloq/mysql-test/eloq_main/r/invisible_field_grant_system.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/invisible_field_grant_system.result rename to storage/eloq/mysql-test/eloq_main/r/invisible_field_grant_system.result diff --git a/storage/eloq/mysql-test/mono_main/r/invisible_partition.result b/storage/eloq/mysql-test/eloq_main/r/invisible_partition.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/invisible_partition.result rename to storage/eloq/mysql-test/eloq_main/r/invisible_partition.result diff --git a/storage/eloq/mysql-test/mono_main/r/ipv4_and_ipv6.result b/storage/eloq/mysql-test/eloq_main/r/ipv4_and_ipv6.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ipv4_and_ipv6.result rename to storage/eloq/mysql-test/eloq_main/r/ipv4_and_ipv6.result diff --git a/storage/eloq/mysql-test/mono_main/r/ipv4_as_ipv6.result b/storage/eloq/mysql-test/eloq_main/r/ipv4_as_ipv6.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ipv4_as_ipv6.result rename to storage/eloq/mysql-test/eloq_main/r/ipv4_as_ipv6.result diff --git a/storage/eloq/mysql-test/mono_main/r/ipv6.result b/storage/eloq/mysql-test/eloq_main/r/ipv6.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ipv6.result rename to storage/eloq/mysql-test/eloq_main/r/ipv6.result diff --git a/storage/eloq/mysql-test/mono_main/r/join.result b/storage/eloq/mysql-test/eloq_main/r/join.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/join.result rename to storage/eloq/mysql-test/eloq_main/r/join.result diff --git a/storage/eloq/mysql-test/mono_main/r/join_cache.result b/storage/eloq/mysql-test/eloq_main/r/join_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/join_cache.result rename to storage/eloq/mysql-test/eloq_main/r/join_cache.result diff --git a/storage/eloq/mysql-test/mono_main/r/join_crash.result b/storage/eloq/mysql-test/eloq_main/r/join_crash.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/join_crash.result rename to storage/eloq/mysql-test/eloq_main/r/join_crash.result diff --git a/storage/eloq/mysql-test/mono_main/r/join_nested.result b/storage/eloq/mysql-test/eloq_main/r/join_nested.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/join_nested.result rename to storage/eloq/mysql-test/eloq_main/r/join_nested.result diff --git a/storage/eloq/mysql-test/mono_main/r/join_nested_jcl6.result b/storage/eloq/mysql-test/eloq_main/r/join_nested_jcl6.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/join_nested_jcl6.result rename to storage/eloq/mysql-test/eloq_main/r/join_nested_jcl6.result diff --git a/storage/eloq/mysql-test/mono_main/r/join_optimizer.result b/storage/eloq/mysql-test/eloq_main/r/join_optimizer.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/join_optimizer.result rename to storage/eloq/mysql-test/eloq_main/r/join_optimizer.result diff --git a/storage/eloq/mysql-test/mono_main/r/join_outer.result b/storage/eloq/mysql-test/eloq_main/r/join_outer.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/join_outer.result rename to storage/eloq/mysql-test/eloq_main/r/join_outer.result diff --git a/storage/eloq/mysql-test/mono_main/r/join_outer_innodb.result b/storage/eloq/mysql-test/eloq_main/r/join_outer_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/join_outer_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/join_outer_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/join_outer_jcl6.result b/storage/eloq/mysql-test/eloq_main/r/join_outer_jcl6.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/join_outer_jcl6.result rename to storage/eloq/mysql-test/eloq_main/r/join_outer_jcl6.result diff --git a/storage/eloq/mysql-test/mono_main/r/key.result b/storage/eloq/mysql-test/eloq_main/r/key.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/key.result rename to storage/eloq/mysql-test/eloq_main/r/key.result diff --git a/storage/eloq/mysql-test/mono_main/r/key_cache.result b/storage/eloq/mysql-test/eloq_main/r/key_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/key_cache.result rename to storage/eloq/mysql-test/eloq_main/r/key_cache.result diff --git a/storage/eloq/mysql-test/mono_main/r/key_diff.result b/storage/eloq/mysql-test/eloq_main/r/key_diff.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/key_diff.result rename to storage/eloq/mysql-test/eloq_main/r/key_diff.result diff --git a/storage/eloq/mysql-test/mono_main/r/key_primary.result b/storage/eloq/mysql-test/eloq_main/r/key_primary.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/key_primary.result rename to storage/eloq/mysql-test/eloq_main/r/key_primary.result diff --git a/storage/eloq/mysql-test/mono_main/r/keyread.result b/storage/eloq/mysql-test/eloq_main/r/keyread.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/keyread.result rename to storage/eloq/mysql-test/eloq_main/r/keyread.result diff --git a/storage/eloq/mysql-test/mono_main/r/keywords.result b/storage/eloq/mysql-test/eloq_main/r/keywords.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/keywords.result rename to storage/eloq/mysql-test/eloq_main/r/keywords.result diff --git a/storage/eloq/mysql-test/mono_main/r/kill-2.result b/storage/eloq/mysql-test/eloq_main/r/kill-2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/kill-2.result rename to storage/eloq/mysql-test/eloq_main/r/kill-2.result diff --git a/storage/eloq/mysql-test/mono_main/r/kill.result b/storage/eloq/mysql-test/eloq_main/r/kill.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/kill.result rename to storage/eloq/mysql-test/eloq_main/r/kill.result diff --git a/storage/eloq/mysql-test/mono_main/r/kill_processlist-6619.result b/storage/eloq/mysql-test/eloq_main/r/kill_processlist-6619.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/kill_processlist-6619.result rename to storage/eloq/mysql-test/eloq_main/r/kill_processlist-6619.result diff --git a/storage/eloq/mysql-test/mono_main/r/kill_query-6728.result b/storage/eloq/mysql-test/eloq_main/r/kill_query-6728.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/kill_query-6728.result rename to storage/eloq/mysql-test/eloq_main/r/kill_query-6728.result diff --git a/storage/eloq/mysql-test/mono_main/r/large_pages.result b/storage/eloq/mysql-test/eloq_main/r/large_pages.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/large_pages.result rename to storage/eloq/mysql-test/eloq_main/r/large_pages.result diff --git a/storage/eloq/mysql-test/mono_main/r/last_value.result b/storage/eloq/mysql-test/eloq_main/r/last_value.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/last_value.result rename to storage/eloq/mysql-test/eloq_main/r/last_value.result diff --git a/storage/eloq/mysql-test/mono_main/r/limit.result b/storage/eloq/mysql-test/eloq_main/r/limit.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/limit.result rename to storage/eloq/mysql-test/eloq_main/r/limit.result diff --git a/storage/eloq/mysql-test/mono_main/r/limit_rows_examined.result b/storage/eloq/mysql-test/eloq_main/r/limit_rows_examined.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/limit_rows_examined.result rename to storage/eloq/mysql-test/eloq_main/r/limit_rows_examined.result diff --git a/storage/eloq/mysql-test/mono_main/r/loaddata.result b/storage/eloq/mysql-test/eloq_main/r/loaddata.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/loaddata.result rename to storage/eloq/mysql-test/eloq_main/r/loaddata.result diff --git a/storage/eloq/mysql-test/mono_main/r/loaddata_autocom_innodb.result b/storage/eloq/mysql-test/eloq_main/r/loaddata_autocom_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/loaddata_autocom_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/loaddata_autocom_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/loadxml.result b/storage/eloq/mysql-test/eloq_main/r/loadxml.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/loadxml.result rename to storage/eloq/mysql-test/eloq_main/r/loadxml.result diff --git a/storage/eloq/mysql-test/mono_main/r/locale.result b/storage/eloq/mysql-test/eloq_main/r/locale.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/locale.result rename to storage/eloq/mysql-test/eloq_main/r/locale.result diff --git a/storage/eloq/mysql-test/mono_main/r/lock.result b/storage/eloq/mysql-test/eloq_main/r/lock.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lock.result rename to storage/eloq/mysql-test/eloq_main/r/lock.result diff --git a/storage/eloq/mysql-test/mono_main/r/lock_kill.result b/storage/eloq/mysql-test/eloq_main/r/lock_kill.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lock_kill.result rename to storage/eloq/mysql-test/eloq_main/r/lock_kill.result diff --git a/storage/eloq/mysql-test/mono_main/r/lock_multi.result b/storage/eloq/mysql-test/eloq_main/r/lock_multi.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lock_multi.result rename to storage/eloq/mysql-test/eloq_main/r/lock_multi.result diff --git a/storage/eloq/mysql-test/mono_main/r/lock_multi_bug38499.result b/storage/eloq/mysql-test/eloq_main/r/lock_multi_bug38499.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lock_multi_bug38499.result rename to storage/eloq/mysql-test/eloq_main/r/lock_multi_bug38499.result diff --git a/storage/eloq/mysql-test/mono_main/r/lock_multi_bug38691.result b/storage/eloq/mysql-test/eloq_main/r/lock_multi_bug38691.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lock_multi_bug38691.result rename to storage/eloq/mysql-test/eloq_main/r/lock_multi_bug38691.result diff --git a/storage/eloq/mysql-test/mono_main/r/lock_sync.result b/storage/eloq/mysql-test/eloq_main/r/lock_sync.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lock_sync.result rename to storage/eloq/mysql-test/eloq_main/r/lock_sync.result diff --git a/storage/eloq/mysql-test/mono_main/r/lock_tables_lost_commit.result b/storage/eloq/mysql-test/eloq_main/r/lock_tables_lost_commit.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lock_tables_lost_commit.result rename to storage/eloq/mysql-test/eloq_main/r/lock_tables_lost_commit.result diff --git a/storage/eloq/mysql-test/mono_main/r/lock_user.result b/storage/eloq/mysql-test/eloq_main/r/lock_user.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lock_user.result rename to storage/eloq/mysql-test/eloq_main/r/lock_user.result diff --git a/storage/eloq/mysql-test/mono_main/r/lock_view.result b/storage/eloq/mysql-test/eloq_main/r/lock_view.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lock_view.result rename to storage/eloq/mysql-test/eloq_main/r/lock_view.result diff --git a/storage/eloq/mysql-test/mono_main/r/locked_temporary-5955.result b/storage/eloq/mysql-test/eloq_main/r/locked_temporary-5955.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/locked_temporary-5955.result rename to storage/eloq/mysql-test/eloq_main/r/locked_temporary-5955.result diff --git a/storage/eloq/mysql-test/mono_main/r/locking_clause.result b/storage/eloq/mysql-test/eloq_main/r/locking_clause.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/locking_clause.result rename to storage/eloq/mysql-test/eloq_main/r/locking_clause.result diff --git a/storage/eloq/mysql-test/mono_main/r/log_errchk.result b/storage/eloq/mysql-test/eloq_main/r/log_errchk.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/log_errchk.result rename to storage/eloq/mysql-test/eloq_main/r/log_errchk.result diff --git a/storage/eloq/mysql-test/mono_main/r/log_slow.result b/storage/eloq/mysql-test/eloq_main/r/log_slow.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/log_slow.result rename to storage/eloq/mysql-test/eloq_main/r/log_slow.result diff --git a/storage/eloq/mysql-test/mono_main/r/log_slow_debug.result b/storage/eloq/mysql-test/eloq_main/r/log_slow_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/log_slow_debug.result rename to storage/eloq/mysql-test/eloq_main/r/log_slow_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/log_state.result b/storage/eloq/mysql-test/eloq_main/r/log_state.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/log_state.result rename to storage/eloq/mysql-test/eloq_main/r/log_state.result diff --git a/storage/eloq/mysql-test/mono_main/r/log_state_bug33693.result b/storage/eloq/mysql-test/eloq_main/r/log_state_bug33693.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/log_state_bug33693.result rename to storage/eloq/mysql-test/eloq_main/r/log_state_bug33693.result diff --git a/storage/eloq/mysql-test/mono_main/r/log_tables-big.result b/storage/eloq/mysql-test/eloq_main/r/log_tables-big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/log_tables-big.result rename to storage/eloq/mysql-test/eloq_main/r/log_tables-big.result diff --git a/storage/eloq/mysql-test/mono_main/r/log_tables.result b/storage/eloq/mysql-test/eloq_main/r/log_tables.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/log_tables.result rename to storage/eloq/mysql-test/eloq_main/r/log_tables.result diff --git a/storage/eloq/mysql-test/mono_main/r/log_tables_debug.result b/storage/eloq/mysql-test/eloq_main/r/log_tables_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/log_tables_debug.result rename to storage/eloq/mysql-test/eloq_main/r/log_tables_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/log_tables_upgrade.result b/storage/eloq/mysql-test/eloq_main/r/log_tables_upgrade.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/log_tables_upgrade.result rename to storage/eloq/mysql-test/eloq_main/r/log_tables_upgrade.result diff --git a/storage/eloq/mysql-test/mono_main/r/long_host.result b/storage/eloq/mysql-test/eloq_main/r/long_host.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/long_host.result rename to storage/eloq/mysql-test/eloq_main/r/long_host.result diff --git a/storage/eloq/mysql-test/mono_main/r/long_tmpdir.result b/storage/eloq/mysql-test/eloq_main/r/long_tmpdir.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/long_tmpdir.result rename to storage/eloq/mysql-test/eloq_main/r/long_tmpdir.result diff --git a/storage/eloq/mysql-test/mono_main/r/long_unique.result b/storage/eloq/mysql-test/eloq_main/r/long_unique.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/long_unique.result rename to storage/eloq/mysql-test/eloq_main/r/long_unique.result diff --git a/storage/eloq/mysql-test/mono_main/r/long_unique_bugs.result b/storage/eloq/mysql-test/eloq_main/r/long_unique_bugs.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/long_unique_bugs.result rename to storage/eloq/mysql-test/eloq_main/r/long_unique_bugs.result diff --git a/storage/eloq/mysql-test/mono_main/r/long_unique_bugs_replication.result b/storage/eloq/mysql-test/eloq_main/r/long_unique_bugs_replication.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/long_unique_bugs_replication.result rename to storage/eloq/mysql-test/eloq_main/r/long_unique_bugs_replication.result diff --git a/storage/eloq/mysql-test/mono_main/r/long_unique_debug.result b/storage/eloq/mysql-test/eloq_main/r/long_unique_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/long_unique_debug.result rename to storage/eloq/mysql-test/eloq_main/r/long_unique_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/long_unique_delayed.result b/storage/eloq/mysql-test/eloq_main/r/long_unique_delayed.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/long_unique_delayed.result rename to storage/eloq/mysql-test/eloq_main/r/long_unique_delayed.result diff --git a/storage/eloq/mysql-test/mono_main/r/long_unique_innodb.result b/storage/eloq/mysql-test/eloq_main/r/long_unique_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/long_unique_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/long_unique_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/long_unique_update.result b/storage/eloq/mysql-test/eloq_main/r/long_unique_update.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/long_unique_update.result rename to storage/eloq/mysql-test/eloq_main/r/long_unique_update.result diff --git a/storage/eloq/mysql-test/mono_main/r/long_unique_using_hash.result b/storage/eloq/mysql-test/eloq_main/r/long_unique_using_hash.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/long_unique_using_hash.result rename to storage/eloq/mysql-test/eloq_main/r/long_unique_using_hash.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_fs_off.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_fs_off.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_fs_off.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_fs_off.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_fs_on.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_fs_on.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_fs_on.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_fs_on.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_mixed_tmpdir.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_mixed_tmpdir.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_mixed_tmpdir.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_mixed_tmpdir.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_mixed_tmpdir_innodb.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_mixed_tmpdir_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_mixed_tmpdir_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_mixed_tmpdir_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_table.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_table.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_table.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_table2.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_table2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_table2.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_table2.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_table4.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_table4.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_table4.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_table4.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_table5.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_table5.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_table5.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_table5.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_table_grant.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_table_grant.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_table_grant.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_table_grant.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_table_qcache.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_table_qcache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_table_qcache.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_table_qcache.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_utf8.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_utf8.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_utf8.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_utf8.result diff --git a/storage/eloq/mysql-test/mono_main/r/lowercase_view.result b/storage/eloq/mysql-test/eloq_main/r/lowercase_view.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/lowercase_view.result rename to storage/eloq/mysql-test/eloq_main/r/lowercase_view.result diff --git a/storage/eloq/mysql-test/mono_main/r/max_password_errors.result b/storage/eloq/mysql-test/eloq_main/r/max_password_errors.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/max_password_errors.result rename to storage/eloq/mysql-test/eloq_main/r/max_password_errors.result diff --git a/storage/eloq/mysql-test/mono_main/r/max_statement_time.result b/storage/eloq/mysql-test/eloq_main/r/max_statement_time.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/max_statement_time.result rename to storage/eloq/mysql-test/eloq_main/r/max_statement_time.result diff --git a/storage/eloq/mysql-test/mono_main/r/mdev-21101.result b/storage/eloq/mysql-test/eloq_main/r/mdev-21101.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mdev-21101.result rename to storage/eloq/mysql-test/eloq_main/r/mdev-21101.result diff --git a/storage/eloq/mysql-test/mono_main/r/mdev13607.result b/storage/eloq/mysql-test/eloq_main/r/mdev13607.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mdev13607.result rename to storage/eloq/mysql-test/eloq_main/r/mdev13607.result diff --git a/storage/eloq/mysql-test/mono_main/r/mdev19198.result b/storage/eloq/mysql-test/eloq_main/r/mdev19198.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mdev19198.result rename to storage/eloq/mysql-test/eloq_main/r/mdev19198.result diff --git a/storage/eloq/mysql-test/mono_main/r/mdev316.result b/storage/eloq/mysql-test/eloq_main/r/mdev316.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mdev316.result rename to storage/eloq/mysql-test/eloq_main/r/mdev316.result diff --git a/storage/eloq/mysql-test/mono_main/r/mdev375.result b/storage/eloq/mysql-test/eloq_main/r/mdev375.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mdev375.result rename to storage/eloq/mysql-test/eloq_main/r/mdev375.result diff --git a/storage/eloq/mysql-test/mono_main/r/mdev6830.result b/storage/eloq/mysql-test/eloq_main/r/mdev6830.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mdev6830.result rename to storage/eloq/mysql-test/eloq_main/r/mdev6830.result diff --git a/storage/eloq/mysql-test/mono_main/r/mdev_14586.result b/storage/eloq/mysql-test/eloq_main/r/mdev_14586.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mdev_14586.result rename to storage/eloq/mysql-test/eloq_main/r/mdev_14586.result diff --git a/storage/eloq/mysql-test/mono_main/r/mdev_19276.result b/storage/eloq/mysql-test/eloq_main/r/mdev_19276.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mdev_19276.result rename to storage/eloq/mysql-test/eloq_main/r/mdev_19276.result diff --git a/storage/eloq/mysql-test/mono_main/r/mdev_22370.result b/storage/eloq/mysql-test/eloq_main/r/mdev_22370.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mdev_22370.result rename to storage/eloq/mysql-test/eloq_main/r/mdev_22370.result diff --git a/storage/eloq/mysql-test/mono_main/r/mdl.result b/storage/eloq/mysql-test/eloq_main/r/mdl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mdl.result rename to storage/eloq/mysql-test/eloq_main/r/mdl.result diff --git a/storage/eloq/mysql-test/mono_main/r/mdl_sync.result b/storage/eloq/mysql-test/eloq_main/r/mdl_sync.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mdl_sync.result rename to storage/eloq/mysql-test/eloq_main/r/mdl_sync.result diff --git a/storage/eloq/mysql-test/mono_main/r/merge-big.result b/storage/eloq/mysql-test/eloq_main/r/merge-big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/merge-big.result rename to storage/eloq/mysql-test/eloq_main/r/merge-big.result diff --git a/storage/eloq/mysql-test/mono_main/r/merge.result b/storage/eloq/mysql-test/eloq_main/r/merge.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/merge.result rename to storage/eloq/mysql-test/eloq_main/r/merge.result diff --git a/storage/eloq/mysql-test/mono_main/r/merge_debug.result b/storage/eloq/mysql-test/eloq_main/r/merge_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/merge_debug.result rename to storage/eloq/mysql-test/eloq_main/r/merge_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/merge_innodb.result b/storage/eloq/mysql-test/eloq_main/r/merge_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/merge_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/merge_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/merge_mmap.result b/storage/eloq/mysql-test/eloq_main/r/merge_mmap.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/merge_mmap.result rename to storage/eloq/mysql-test/eloq_main/r/merge_mmap.result diff --git a/storage/eloq/mysql-test/mono_main/r/metadata.result b/storage/eloq/mysql-test/eloq_main/r/metadata.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/metadata.result rename to storage/eloq/mysql-test/eloq_main/r/metadata.result diff --git a/storage/eloq/mysql-test/mono_main/r/mix2_myisam.result b/storage/eloq/mysql-test/eloq_main/r/mix2_myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mix2_myisam.result rename to storage/eloq/mysql-test/eloq_main/r/mix2_myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/mix2_myisam_ucs2.result b/storage/eloq/mysql-test/eloq_main/r/mix2_myisam_ucs2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mix2_myisam_ucs2.result rename to storage/eloq/mysql-test/eloq_main/r/mix2_myisam_ucs2.result diff --git a/storage/eloq/mysql-test/mono_main/r/mrr_derived_crash_4610.result b/storage/eloq/mysql-test/eloq_main/r/mrr_derived_crash_4610.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mrr_derived_crash_4610.result rename to storage/eloq/mysql-test/eloq_main/r/mrr_derived_crash_4610.result diff --git a/storage/eloq/mysql-test/mono_main/r/mrr_icp_extra.result b/storage/eloq/mysql-test/eloq_main/r/mrr_icp_extra.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mrr_icp_extra.result rename to storage/eloq/mysql-test/eloq_main/r/mrr_icp_extra.result diff --git a/storage/eloq/mysql-test/mono_main/r/multi_statement.result b/storage/eloq/mysql-test/eloq_main/r/multi_statement.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/multi_statement.result rename to storage/eloq/mysql-test/eloq_main/r/multi_statement.result diff --git a/storage/eloq/mysql-test/mono_main/r/multi_update.result b/storage/eloq/mysql-test/eloq_main/r/multi_update.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/multi_update.result rename to storage/eloq/mysql-test/eloq_main/r/multi_update.result diff --git a/storage/eloq/mysql-test/mono_main/r/multi_update_big.result b/storage/eloq/mysql-test/eloq_main/r/multi_update_big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/multi_update_big.result rename to storage/eloq/mysql-test/eloq_main/r/multi_update_big.result diff --git a/storage/eloq/mysql-test/mono_main/r/multi_update_binlog.result b/storage/eloq/mysql-test/eloq_main/r/multi_update_binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/multi_update_binlog.result rename to storage/eloq/mysql-test/eloq_main/r/multi_update_binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/multi_update_debug.result b/storage/eloq/mysql-test/eloq_main/r/multi_update_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/multi_update_debug.result rename to storage/eloq/mysql-test/eloq_main/r/multi_update_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/multi_update_innodb.result b/storage/eloq/mysql-test/eloq_main/r/multi_update_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/multi_update_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/multi_update_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/multi_update_tiny_hash.result b/storage/eloq/mysql-test/eloq_main/r/multi_update_tiny_hash.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/multi_update_tiny_hash.result rename to storage/eloq/mysql-test/eloq_main/r/multi_update_tiny_hash.result diff --git a/storage/eloq/mysql-test/mono_main/r/my_print_defaults.result b/storage/eloq/mysql-test/eloq_main/r/my_print_defaults.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/my_print_defaults.result rename to storage/eloq/mysql-test/eloq_main/r/my_print_defaults.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam-big.result b/storage/eloq/mysql-test/eloq_main/r/myisam-big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam-big.result rename to storage/eloq/mysql-test/eloq_main/r/myisam-big.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam-blob.result b/storage/eloq/mysql-test/eloq_main/r/myisam-blob.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam-blob.result rename to storage/eloq/mysql-test/eloq_main/r/myisam-blob.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam-optimize.result b/storage/eloq/mysql-test/eloq_main/r/myisam-optimize.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam-optimize.result rename to storage/eloq/mysql-test/eloq_main/r/myisam-optimize.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam-system.result b/storage/eloq/mysql-test/eloq_main/r/myisam-system.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam-system.result rename to storage/eloq/mysql-test/eloq_main/r/myisam-system.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam.result b/storage/eloq/mysql-test/eloq_main/r/myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam.result rename to storage/eloq/mysql-test/eloq_main/r/myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam_crash_before_flush_keys.result b/storage/eloq/mysql-test/eloq_main/r/myisam_crash_before_flush_keys.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam_crash_before_flush_keys.result rename to storage/eloq/mysql-test/eloq_main/r/myisam_crash_before_flush_keys.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam_debug.result b/storage/eloq/mysql-test/eloq_main/r/myisam_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam_debug.result rename to storage/eloq/mysql-test/eloq_main/r/myisam_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam_enable_keys-10506.result b/storage/eloq/mysql-test/eloq_main/r/myisam_enable_keys-10506.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam_enable_keys-10506.result rename to storage/eloq/mysql-test/eloq_main/r/myisam_enable_keys-10506.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam_explain_non_select_all.result b/storage/eloq/mysql-test/eloq_main/r/myisam_explain_non_select_all.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam_explain_non_select_all.result rename to storage/eloq/mysql-test/eloq_main/r/myisam_explain_non_select_all.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam_icp.result b/storage/eloq/mysql-test/eloq_main/r/myisam_icp.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam_icp.result rename to storage/eloq/mysql-test/eloq_main/r/myisam_icp.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam_icp_debug.result b/storage/eloq/mysql-test/eloq_main/r/myisam_icp_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam_icp_debug.result rename to storage/eloq/mysql-test/eloq_main/r/myisam_icp_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam_icp_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/myisam_icp_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam_icp_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/myisam_icp_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam_mrr,32bit.rdiff b/storage/eloq/mysql-test/eloq_main/r/myisam_mrr,32bit.rdiff similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam_mrr,32bit.rdiff rename to storage/eloq/mysql-test/eloq_main/r/myisam_mrr,32bit.rdiff diff --git a/storage/eloq/mysql-test/mono_main/r/myisam_mrr.result b/storage/eloq/mysql-test/eloq_main/r/myisam_mrr.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam_mrr.result rename to storage/eloq/mysql-test/eloq_main/r/myisam_mrr.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam_optimize.result b/storage/eloq/mysql-test/eloq_main/r/myisam_optimize.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam_optimize.result rename to storage/eloq/mysql-test/eloq_main/r/myisam_optimize.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisam_recover.result b/storage/eloq/mysql-test/eloq_main/r/myisam_recover.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisam_recover.result rename to storage/eloq/mysql-test/eloq_main/r/myisam_recover.result diff --git a/storage/eloq/mysql-test/mono_main/r/myisampack.result b/storage/eloq/mysql-test/eloq_main/r/myisampack.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/myisampack.result rename to storage/eloq/mysql-test/eloq_main/r/myisampack.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql-bug41486.result b/storage/eloq/mysql-test/eloq_main/r/mysql-bug41486.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql-bug41486.result rename to storage/eloq/mysql-test/eloq_main/r/mysql-bug41486.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql-bug45236.result b/storage/eloq/mysql-test/eloq_main/r/mysql-bug45236.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql-bug45236.result rename to storage/eloq/mysql-test/eloq_main/r/mysql-bug45236.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql-metadata.result b/storage/eloq/mysql-test/eloq_main/r/mysql-metadata.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql-metadata.result rename to storage/eloq/mysql-test/eloq_main/r/mysql-metadata.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql.result b/storage/eloq/mysql-test/eloq_main/r/mysql.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql.result rename to storage/eloq/mysql-test/eloq_main/r/mysql.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql5613mysql.result b/storage/eloq/mysql-test/eloq_main/r/mysql5613mysql.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql5613mysql.result rename to storage/eloq/mysql-test/eloq_main/r/mysql5613mysql.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql57_virtual.result b/storage/eloq/mysql-test/eloq_main/r/mysql57_virtual.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql57_virtual.result rename to storage/eloq/mysql-test/eloq_main/r/mysql57_virtual.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_binary_mode.result b/storage/eloq/mysql-test/eloq_main/r/mysql_binary_mode.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_binary_mode.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_binary_mode.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_binary_zero_insert.result b/storage/eloq/mysql-test/eloq_main/r/mysql_binary_zero_insert.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_binary_zero_insert.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_binary_zero_insert.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_client_test.result b/storage/eloq/mysql-test/eloq_main/r/mysql_client_test.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_client_test.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_client_test.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_client_test_comp.result b/storage/eloq/mysql-test/eloq_main/r/mysql_client_test_comp.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_client_test_comp.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_client_test_comp.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_client_test_nonblock.result b/storage/eloq/mysql-test/eloq_main/r/mysql_client_test_nonblock.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_client_test_nonblock.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_client_test_nonblock.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_comments.result b/storage/eloq/mysql-test/eloq_main/r/mysql_comments.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_comments.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_comments.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_cp932.result b/storage/eloq/mysql-test/eloq_main/r/mysql_cp932.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_cp932.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_cp932.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_embedded.result b/storage/eloq/mysql-test/eloq_main/r/mysql_embedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_embedded.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_embedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_install_db_win.result b/storage/eloq/mysql-test/eloq_main/r/mysql_install_db_win.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_install_db_win.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_install_db_win.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_json_mysql_upgrade.result b/storage/eloq/mysql-test/eloq_main/r/mysql_json_mysql_upgrade.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_json_mysql_upgrade.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_json_mysql_upgrade.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_json_mysql_upgrade_with_plugin_loaded.result b/storage/eloq/mysql-test/eloq_main/r/mysql_json_mysql_upgrade_with_plugin_loaded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_json_mysql_upgrade_with_plugin_loaded.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_json_mysql_upgrade_with_plugin_loaded.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_json_table_recreate.result b/storage/eloq/mysql-test/eloq_main/r/mysql_json_table_recreate.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_json_table_recreate.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_json_table_recreate.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_locale_posix.result b/storage/eloq/mysql-test/eloq_main/r/mysql_locale_posix.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_locale_posix.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_locale_posix.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_not_windows.result b/storage/eloq/mysql-test/eloq_main/r/mysql_not_windows.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_not_windows.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_not_windows.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_protocols.result b/storage/eloq/mysql-test/eloq_main/r/mysql_protocols.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_protocols.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_protocols.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_tzinfo_to_sql_symlink.result b/storage/eloq/mysql-test/eloq_main/r/mysql_tzinfo_to_sql_symlink.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_tzinfo_to_sql_symlink.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_tzinfo_to_sql_symlink.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_upgrade-20228.result b/storage/eloq/mysql-test/eloq_main/r/mysql_upgrade-20228.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_upgrade-20228.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_upgrade-20228.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_upgrade-6984.result b/storage/eloq/mysql-test/eloq_main/r/mysql_upgrade-6984.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_upgrade-6984.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_upgrade-6984.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_upgrade.result b/storage/eloq/mysql-test/eloq_main/r/mysql_upgrade.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_upgrade.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_upgrade.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_upgrade_mysql_json_datatype.result b/storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_mysql_json_datatype.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_upgrade_mysql_json_datatype.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_mysql_json_datatype.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_upgrade_no_innodb.result b/storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_no_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_upgrade_no_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_no_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_upgrade_noengine.result b/storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_noengine.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_upgrade_noengine.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_noengine.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_upgrade_ssl.result b/storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_ssl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_upgrade_ssl.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_ssl.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_upgrade_to_100502.result b/storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_to_100502.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_upgrade_to_100502.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_to_100502.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysql_upgrade_view.result b/storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_view.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysql_upgrade_view.result rename to storage/eloq/mysql-test/eloq_main/r/mysql_upgrade_view.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqladmin.result b/storage/eloq/mysql-test/eloq_main/r/mysqladmin.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqladmin.result rename to storage/eloq/mysql-test/eloq_main/r/mysqladmin.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqlbinlog-innodb.result b/storage/eloq/mysql-test/eloq_main/r/mysqlbinlog-innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqlbinlog-innodb.result rename to storage/eloq/mysql-test/eloq_main/r/mysqlbinlog-innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqlbinlog.result b/storage/eloq/mysql-test/eloq_main/r/mysqlbinlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqlbinlog.result rename to storage/eloq/mysql-test/eloq_main/r/mysqlbinlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqlbinlog_raw_mode.result b/storage/eloq/mysql-test/eloq_main/r/mysqlbinlog_raw_mode.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqlbinlog_raw_mode.result rename to storage/eloq/mysql-test/eloq_main/r/mysqlbinlog_raw_mode.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqlbinlog_row_big.result b/storage/eloq/mysql-test/eloq_main/r/mysqlbinlog_row_big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqlbinlog_row_big.result rename to storage/eloq/mysql-test/eloq_main/r/mysqlbinlog_row_big.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqlbinlog_row_compressed.result b/storage/eloq/mysql-test/eloq_main/r/mysqlbinlog_row_compressed.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqlbinlog_row_compressed.result rename to storage/eloq/mysql-test/eloq_main/r/mysqlbinlog_row_compressed.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqlbinlog_row_minimal.result b/storage/eloq/mysql-test/eloq_main/r/mysqlbinlog_row_minimal.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqlbinlog_row_minimal.result rename to storage/eloq/mysql-test/eloq_main/r/mysqlbinlog_row_minimal.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqlbinlog_stmt_compressed.result b/storage/eloq/mysql-test/eloq_main/r/mysqlbinlog_stmt_compressed.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqlbinlog_stmt_compressed.result rename to storage/eloq/mysql-test/eloq_main/r/mysqlbinlog_stmt_compressed.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqlcheck.result b/storage/eloq/mysql-test/eloq_main/r/mysqlcheck.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqlcheck.result rename to storage/eloq/mysql-test/eloq_main/r/mysqlcheck.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqld--defaults-file.result b/storage/eloq/mysql-test/eloq_main/r/mysqld--defaults-file.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqld--defaults-file.result rename to storage/eloq/mysql-test/eloq_main/r/mysqld--defaults-file.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqld--help,aix.rdiff b/storage/eloq/mysql-test/eloq_main/r/mysqld--help,aix.rdiff similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqld--help,aix.rdiff rename to storage/eloq/mysql-test/eloq_main/r/mysqld--help,aix.rdiff diff --git a/storage/eloq/mysql-test/mono_main/r/mysqld--help,win.rdiff b/storage/eloq/mysql-test/eloq_main/r/mysqld--help,win.rdiff similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqld--help,win.rdiff rename to storage/eloq/mysql-test/eloq_main/r/mysqld--help,win.rdiff diff --git a/storage/eloq/mysql-test/mono_main/r/mysqld--help-aria.result b/storage/eloq/mysql-test/eloq_main/r/mysqld--help-aria.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqld--help-aria.result rename to storage/eloq/mysql-test/eloq_main/r/mysqld--help-aria.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqld--help.result b/storage/eloq/mysql-test/eloq_main/r/mysqld--help.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqld--help.result rename to storage/eloq/mysql-test/eloq_main/r/mysqld--help.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqld_help_crash-9183.result b/storage/eloq/mysql-test/eloq_main/r/mysqld_help_crash-9183.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqld_help_crash-9183.result rename to storage/eloq/mysql-test/eloq_main/r/mysqld_help_crash-9183.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqld_option_err.result b/storage/eloq/mysql-test/eloq_main/r/mysqld_option_err.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqld_option_err.result rename to storage/eloq/mysql-test/eloq_main/r/mysqld_option_err.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqldump-compat-102.result b/storage/eloq/mysql-test/eloq_main/r/mysqldump-compat-102.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqldump-compat-102.result rename to storage/eloq/mysql-test/eloq_main/r/mysqldump-compat-102.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqldump-compat.result b/storage/eloq/mysql-test/eloq_main/r/mysqldump-compat.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqldump-compat.result rename to storage/eloq/mysql-test/eloq_main/r/mysqldump-compat.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqldump-max.result b/storage/eloq/mysql-test/eloq_main/r/mysqldump-max.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqldump-max.result rename to storage/eloq/mysql-test/eloq_main/r/mysqldump-max.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqldump-nl.result b/storage/eloq/mysql-test/eloq_main/r/mysqldump-nl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqldump-nl.result rename to storage/eloq/mysql-test/eloq_main/r/mysqldump-nl.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqldump-no-binlog.result b/storage/eloq/mysql-test/eloq_main/r/mysqldump-no-binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqldump-no-binlog.result rename to storage/eloq/mysql-test/eloq_main/r/mysqldump-no-binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqldump-system,win.rdiff b/storage/eloq/mysql-test/eloq_main/r/mysqldump-system,win.rdiff similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqldump-system,win.rdiff rename to storage/eloq/mysql-test/eloq_main/r/mysqldump-system,win.rdiff diff --git a/storage/eloq/mysql-test/mono_main/r/mysqldump-system.result b/storage/eloq/mysql-test/eloq_main/r/mysqldump-system.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqldump-system.result rename to storage/eloq/mysql-test/eloq_main/r/mysqldump-system.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqldump-utf8mb4.result b/storage/eloq/mysql-test/eloq_main/r/mysqldump-utf8mb4.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqldump-utf8mb4.result rename to storage/eloq/mysql-test/eloq_main/r/mysqldump-utf8mb4.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqldump.result b/storage/eloq/mysql-test/eloq_main/r/mysqldump.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqldump.result rename to storage/eloq/mysql-test/eloq_main/r/mysqldump.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqldump_restore.result b/storage/eloq/mysql-test/eloq_main/r/mysqldump_restore.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqldump_restore.result rename to storage/eloq/mysql-test/eloq_main/r/mysqldump_restore.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqlhotcopy_myisam.result b/storage/eloq/mysql-test/eloq_main/r/mysqlhotcopy_myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqlhotcopy_myisam.result rename to storage/eloq/mysql-test/eloq_main/r/mysqlhotcopy_myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqlshow.result b/storage/eloq/mysql-test/eloq_main/r/mysqlshow.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqlshow.result rename to storage/eloq/mysql-test/eloq_main/r/mysqlshow.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqlslap.result b/storage/eloq/mysql-test/eloq_main/r/mysqlslap.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqlslap.result rename to storage/eloq/mysql-test/eloq_main/r/mysqlslap.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqltest.result b/storage/eloq/mysql-test/eloq_main/r/mysqltest.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqltest.result rename to storage/eloq/mysql-test/eloq_main/r/mysqltest.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqltest_256.result b/storage/eloq/mysql-test/eloq_main/r/mysqltest_256.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqltest_256.result rename to storage/eloq/mysql-test/eloq_main/r/mysqltest_256.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqltest_cont_on_error.result b/storage/eloq/mysql-test/eloq_main/r/mysqltest_cont_on_error.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqltest_cont_on_error.result rename to storage/eloq/mysql-test/eloq_main/r/mysqltest_cont_on_error.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqltest_ps.result b/storage/eloq/mysql-test/eloq_main/r/mysqltest_ps.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqltest_ps.result rename to storage/eloq/mysql-test/eloq_main/r/mysqltest_ps.result diff --git a/storage/eloq/mysql-test/mono_main/r/mysqltest_tracking_info.result b/storage/eloq/mysql-test/eloq_main/r/mysqltest_tracking_info.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/mysqltest_tracking_info.result rename to storage/eloq/mysql-test/eloq_main/r/mysqltest_tracking_info.result diff --git a/storage/eloq/mysql-test/mono_main/r/named_pipe.result b/storage/eloq/mysql-test/eloq_main/r/named_pipe.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/named_pipe.result rename to storage/eloq/mysql-test/eloq_main/r/named_pipe.result diff --git a/storage/eloq/mysql-test/mono_main/r/negation_elimination.result b/storage/eloq/mysql-test/eloq_main/r/negation_elimination.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/negation_elimination.result rename to storage/eloq/mysql-test/eloq_main/r/negation_elimination.result diff --git a/storage/eloq/mysql-test/mono_main/r/nested_profiling.result b/storage/eloq/mysql-test/eloq_main/r/nested_profiling.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/nested_profiling.result rename to storage/eloq/mysql-test/eloq_main/r/nested_profiling.result diff --git a/storage/eloq/mysql-test/mono_main/r/no-threads.result b/storage/eloq/mysql-test/eloq_main/r/no-threads.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/no-threads.result rename to storage/eloq/mysql-test/eloq_main/r/no-threads.result diff --git a/storage/eloq/mysql-test/mono_main/r/no_binlog.result b/storage/eloq/mysql-test/eloq_main/r/no_binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/no_binlog.result rename to storage/eloq/mysql-test/eloq_main/r/no_binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/non_blocking_api.result b/storage/eloq/mysql-test/eloq_main/r/non_blocking_api.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/non_blocking_api.result rename to storage/eloq/mysql-test/eloq_main/r/non_blocking_api.result diff --git a/storage/eloq/mysql-test/mono_main/r/not_embedded_server.result b/storage/eloq/mysql-test/eloq_main/r/not_embedded_server.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/not_embedded_server.result rename to storage/eloq/mysql-test/eloq_main/r/not_embedded_server.result diff --git a/storage/eloq/mysql-test/mono_main/r/not_partition.result b/storage/eloq/mysql-test/eloq_main/r/not_partition.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/not_partition.result rename to storage/eloq/mysql-test/eloq_main/r/not_partition.result diff --git a/storage/eloq/mysql-test/mono_main/r/null.result b/storage/eloq/mysql-test/eloq_main/r/null.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/null.result rename to storage/eloq/mysql-test/eloq_main/r/null.result diff --git a/storage/eloq/mysql-test/mono_main/r/null_key.result b/storage/eloq/mysql-test/eloq_main/r/null_key.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/null_key.result rename to storage/eloq/mysql-test/eloq_main/r/null_key.result diff --git a/storage/eloq/mysql-test/mono_main/r/odbc.result b/storage/eloq/mysql-test/eloq_main/r/odbc.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/odbc.result rename to storage/eloq/mysql-test/eloq_main/r/odbc.result diff --git a/storage/eloq/mysql-test/mono_main/r/olap.result b/storage/eloq/mysql-test/eloq_main/r/olap.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/olap.result rename to storage/eloq/mysql-test/eloq_main/r/olap.result diff --git a/storage/eloq/mysql-test/mono_main/r/old-mode.result b/storage/eloq/mysql-test/eloq_main/r/old-mode.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/old-mode.result rename to storage/eloq/mysql-test/eloq_main/r/old-mode.result diff --git a/storage/eloq/mysql-test/mono_main/r/openssl_1.result b/storage/eloq/mysql-test/eloq_main/r/openssl_1.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/openssl_1.result rename to storage/eloq/mysql-test/eloq_main/r/openssl_1.result diff --git a/storage/eloq/mysql-test/mono_main/r/openssl_6975,tlsv10.result b/storage/eloq/mysql-test/eloq_main/r/openssl_6975,tlsv10.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/openssl_6975,tlsv10.result rename to storage/eloq/mysql-test/eloq_main/r/openssl_6975,tlsv10.result diff --git a/storage/eloq/mysql-test/mono_main/r/openssl_6975,tlsv12.result b/storage/eloq/mysql-test/eloq_main/r/openssl_6975,tlsv12.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/openssl_6975,tlsv12.result rename to storage/eloq/mysql-test/eloq_main/r/openssl_6975,tlsv12.result diff --git a/storage/eloq/mysql-test/mono_main/r/opt_trace,ps.rdiff b/storage/eloq/mysql-test/eloq_main/r/opt_trace,ps.rdiff similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/opt_trace,ps.rdiff rename to storage/eloq/mysql-test/eloq_main/r/opt_trace,ps.rdiff diff --git a/storage/eloq/mysql-test/mono_main/r/opt_trace.result b/storage/eloq/mysql-test/eloq_main/r/opt_trace.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/opt_trace.result rename to storage/eloq/mysql-test/eloq_main/r/opt_trace.result diff --git a/storage/eloq/mysql-test/mono_main/r/opt_trace_index_merge.result b/storage/eloq/mysql-test/eloq_main/r/opt_trace_index_merge.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/opt_trace_index_merge.result rename to storage/eloq/mysql-test/eloq_main/r/opt_trace_index_merge.result diff --git a/storage/eloq/mysql-test/mono_main/r/opt_trace_index_merge_innodb.result b/storage/eloq/mysql-test/eloq_main/r/opt_trace_index_merge_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/opt_trace_index_merge_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/opt_trace_index_merge_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/opt_trace_security.result b/storage/eloq/mysql-test/eloq_main/r/opt_trace_security.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/opt_trace_security.result rename to storage/eloq/mysql-test/eloq_main/r/opt_trace_security.result diff --git a/storage/eloq/mysql-test/mono_main/r/opt_trace_ucs2.result b/storage/eloq/mysql-test/eloq_main/r/opt_trace_ucs2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/opt_trace_ucs2.result rename to storage/eloq/mysql-test/eloq_main/r/opt_trace_ucs2.result diff --git a/storage/eloq/mysql-test/mono_main/r/opt_tvc.result b/storage/eloq/mysql-test/eloq_main/r/opt_tvc.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/opt_tvc.result rename to storage/eloq/mysql-test/eloq_main/r/opt_tvc.result diff --git a/storage/eloq/mysql-test/mono_main/r/order_by-mdev-10122.result b/storage/eloq/mysql-test/eloq_main/r/order_by-mdev-10122.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/order_by-mdev-10122.result rename to storage/eloq/mysql-test/eloq_main/r/order_by-mdev-10122.result diff --git a/storage/eloq/mysql-test/mono_main/r/order_by.result b/storage/eloq/mysql-test/eloq_main/r/order_by.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/order_by.result rename to storage/eloq/mysql-test/eloq_main/r/order_by.result diff --git a/storage/eloq/mysql-test/mono_main/r/order_by_innodb.result b/storage/eloq/mysql-test/eloq_main/r/order_by_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/order_by_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/order_by_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/order_by_optimizer.result b/storage/eloq/mysql-test/eloq_main/r/order_by_optimizer.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/order_by_optimizer.result rename to storage/eloq/mysql-test/eloq_main/r/order_by_optimizer.result diff --git a/storage/eloq/mysql-test/mono_main/r/order_by_optimizer_innodb.result b/storage/eloq/mysql-test/eloq_main/r/order_by_optimizer_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/order_by_optimizer_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/order_by_optimizer_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/order_by_pack_big.result b/storage/eloq/mysql-test/eloq_main/r/order_by_pack_big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/order_by_pack_big.result rename to storage/eloq/mysql-test/eloq_main/r/order_by_pack_big.result diff --git a/storage/eloq/mysql-test/mono_main/r/order_by_sortkey.result b/storage/eloq/mysql-test/eloq_main/r/order_by_sortkey.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/order_by_sortkey.result rename to storage/eloq/mysql-test/eloq_main/r/order_by_sortkey.result diff --git a/storage/eloq/mysql-test/mono_main/r/order_by_zerolength-4285.result b/storage/eloq/mysql-test/eloq_main/r/order_by_zerolength-4285.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/order_by_zerolength-4285.result rename to storage/eloq/mysql-test/eloq_main/r/order_by_zerolength-4285.result diff --git a/storage/eloq/mysql-test/mono_main/r/order_fill_sortbuf.result b/storage/eloq/mysql-test/eloq_main/r/order_fill_sortbuf.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/order_fill_sortbuf.result rename to storage/eloq/mysql-test/eloq_main/r/order_fill_sortbuf.result diff --git a/storage/eloq/mysql-test/mono_main/r/outfile.result b/storage/eloq/mysql-test/eloq_main/r/outfile.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/outfile.result rename to storage/eloq/mysql-test/eloq_main/r/outfile.result diff --git a/storage/eloq/mysql-test/mono_main/r/outfile_loaddata.result b/storage/eloq/mysql-test/eloq_main/r/outfile_loaddata.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/outfile_loaddata.result rename to storage/eloq/mysql-test/eloq_main/r/outfile_loaddata.result diff --git a/storage/eloq/mysql-test/mono_main/r/overflow.result b/storage/eloq/mysql-test/eloq_main/r/overflow.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/overflow.result rename to storage/eloq/mysql-test/eloq_main/r/overflow.result diff --git a/storage/eloq/mysql-test/mono_main/r/packet.result b/storage/eloq/mysql-test/eloq_main/r/packet.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/packet.result rename to storage/eloq/mysql-test/eloq_main/r/packet.result diff --git a/storage/eloq/mysql-test/mono_main/r/parser.result b/storage/eloq/mysql-test/eloq_main/r/parser.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/parser.result rename to storage/eloq/mysql-test/eloq_main/r/parser.result diff --git a/storage/eloq/mysql-test/mono_main/r/parser_bug21114_innodb.result b/storage/eloq/mysql-test/eloq_main/r/parser_bug21114_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/parser_bug21114_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/parser_bug21114_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/parser_not_embedded.result b/storage/eloq/mysql-test/eloq_main/r/parser_not_embedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/parser_not_embedded.result rename to storage/eloq/mysql-test/eloq_main/r/parser_not_embedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/parser_stack.result b/storage/eloq/mysql-test/eloq_main/r/parser_stack.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/parser_stack.result rename to storage/eloq/mysql-test/eloq_main/r/parser_stack.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition.result b/storage/eloq/mysql-test/eloq_main/r/partition.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition.result rename to storage/eloq/mysql-test/eloq_main/r/partition.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_alter.result b/storage/eloq/mysql-test/eloq_main/r/partition_alter.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_alter.result rename to storage/eloq/mysql-test/eloq_main/r/partition_alter.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_binlog.result b/storage/eloq/mysql-test/eloq_main/r/partition_binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_binlog.result rename to storage/eloq/mysql-test/eloq_main/r/partition_binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_binlog_stmt.result b/storage/eloq/mysql-test/eloq_main/r/partition_binlog_stmt.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_binlog_stmt.result rename to storage/eloq/mysql-test/eloq_main/r/partition_binlog_stmt.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_blackhole.result b/storage/eloq/mysql-test/eloq_main/r/partition_blackhole.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_blackhole.result rename to storage/eloq/mysql-test/eloq_main/r/partition_blackhole.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_bug18198.result b/storage/eloq/mysql-test/eloq_main/r/partition_bug18198.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_bug18198.result rename to storage/eloq/mysql-test/eloq_main/r/partition_bug18198.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_cache.result b/storage/eloq/mysql-test/eloq_main/r/partition_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_cache.result rename to storage/eloq/mysql-test/eloq_main/r/partition_cache.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_cache_innodb.result b/storage/eloq/mysql-test/eloq_main/r/partition_cache_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_cache_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/partition_cache_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_cache_myisam.result b/storage/eloq/mysql-test/eloq_main/r/partition_cache_myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_cache_myisam.result rename to storage/eloq/mysql-test/eloq_main/r/partition_cache_myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_charset.result b/storage/eloq/mysql-test/eloq_main/r/partition_charset.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_charset.result rename to storage/eloq/mysql-test/eloq_main/r/partition_charset.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_column.result b/storage/eloq/mysql-test/eloq_main/r/partition_column.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_column.result rename to storage/eloq/mysql-test/eloq_main/r/partition_column.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_column_prune.result b/storage/eloq/mysql-test/eloq_main/r/partition_column_prune.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_column_prune.result rename to storage/eloq/mysql-test/eloq_main/r/partition_column_prune.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_csv.result b/storage/eloq/mysql-test/eloq_main/r/partition_csv.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_csv.result rename to storage/eloq/mysql-test/eloq_main/r/partition_csv.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_datatype.result b/storage/eloq/mysql-test/eloq_main/r/partition_datatype.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_datatype.result rename to storage/eloq/mysql-test/eloq_main/r/partition_datatype.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_debug_sync.result b/storage/eloq/mysql-test/eloq_main/r/partition_debug_sync.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_debug_sync.result rename to storage/eloq/mysql-test/eloq_main/r/partition_debug_sync.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_default.result b/storage/eloq/mysql-test/eloq_main/r/partition_default.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_default.result rename to storage/eloq/mysql-test/eloq_main/r/partition_default.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_disabled.result b/storage/eloq/mysql-test/eloq_main/r/partition_disabled.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_disabled.result rename to storage/eloq/mysql-test/eloq_main/r/partition_disabled.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_error.result b/storage/eloq/mysql-test/eloq_main/r/partition_error.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_error.result rename to storage/eloq/mysql-test/eloq_main/r/partition_error.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_example.result b/storage/eloq/mysql-test/eloq_main/r/partition_example.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_example.result rename to storage/eloq/mysql-test/eloq_main/r/partition_example.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_exchange.result b/storage/eloq/mysql-test/eloq_main/r/partition_exchange.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_exchange.result rename to storage/eloq/mysql-test/eloq_main/r/partition_exchange.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_explicit_prune.result b/storage/eloq/mysql-test/eloq_main/r/partition_explicit_prune.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_explicit_prune.result rename to storage/eloq/mysql-test/eloq_main/r/partition_explicit_prune.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_grant.result b/storage/eloq/mysql-test/eloq_main/r/partition_grant.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_grant.result rename to storage/eloq/mysql-test/eloq_main/r/partition_grant.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_hash.result b/storage/eloq/mysql-test/eloq_main/r/partition_hash.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_hash.result rename to storage/eloq/mysql-test/eloq_main/r/partition_hash.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_innodb.result b/storage/eloq/mysql-test/eloq_main/r/partition_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/partition_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_innodb_plugin.result b/storage/eloq/mysql-test/eloq_main/r/partition_innodb_plugin.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_innodb_plugin.result rename to storage/eloq/mysql-test/eloq_main/r/partition_innodb_plugin.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_innodb_semi_consistent.result b/storage/eloq/mysql-test/eloq_main/r/partition_innodb_semi_consistent.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_innodb_semi_consistent.result rename to storage/eloq/mysql-test/eloq_main/r/partition_innodb_semi_consistent.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_innodb_stmt.result b/storage/eloq/mysql-test/eloq_main/r/partition_innodb_stmt.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_innodb_stmt.result rename to storage/eloq/mysql-test/eloq_main/r/partition_innodb_stmt.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_key_cache.result b/storage/eloq/mysql-test/eloq_main/r/partition_key_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_key_cache.result rename to storage/eloq/mysql-test/eloq_main/r/partition_key_cache.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_list.result b/storage/eloq/mysql-test/eloq_main/r/partition_list.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_list.result rename to storage/eloq/mysql-test/eloq_main/r/partition_list.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_mgm.result b/storage/eloq/mysql-test/eloq_main/r/partition_mgm.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_mgm.result rename to storage/eloq/mysql-test/eloq_main/r/partition_mgm.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_mgm_err.result b/storage/eloq/mysql-test/eloq_main/r/partition_mgm_err.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_mgm_err.result rename to storage/eloq/mysql-test/eloq_main/r/partition_mgm_err.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_mgm_err2.result b/storage/eloq/mysql-test/eloq_main/r/partition_mgm_err2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_mgm_err2.result rename to storage/eloq/mysql-test/eloq_main/r/partition_mgm_err2.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_mrr_aria.result b/storage/eloq/mysql-test/eloq_main/r/partition_mrr_aria.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_mrr_aria.result rename to storage/eloq/mysql-test/eloq_main/r/partition_mrr_aria.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_mrr_innodb.result b/storage/eloq/mysql-test/eloq_main/r/partition_mrr_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_mrr_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/partition_mrr_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_mrr_myisam.result b/storage/eloq/mysql-test/eloq_main/r/partition_mrr_myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_mrr_myisam.result rename to storage/eloq/mysql-test/eloq_main/r/partition_mrr_myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_myisam.result b/storage/eloq/mysql-test/eloq_main/r/partition_myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_myisam.result rename to storage/eloq/mysql-test/eloq_main/r/partition_myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_not_blackhole.result b/storage/eloq/mysql-test/eloq_main/r/partition_not_blackhole.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_not_blackhole.result rename to storage/eloq/mysql-test/eloq_main/r/partition_not_blackhole.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_not_windows.result b/storage/eloq/mysql-test/eloq_main/r/partition_not_windows.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_not_windows.result rename to storage/eloq/mysql-test/eloq_main/r/partition_not_windows.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_open_files_limit.result b/storage/eloq/mysql-test/eloq_main/r/partition_open_files_limit.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_open_files_limit.result rename to storage/eloq/mysql-test/eloq_main/r/partition_open_files_limit.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_order.result b/storage/eloq/mysql-test/eloq_main/r/partition_order.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_order.result rename to storage/eloq/mysql-test/eloq_main/r/partition_order.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_pruning.result b/storage/eloq/mysql-test/eloq_main/r/partition_pruning.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_pruning.result rename to storage/eloq/mysql-test/eloq_main/r/partition_pruning.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_range.result b/storage/eloq/mysql-test/eloq_main/r/partition_range.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_range.result rename to storage/eloq/mysql-test/eloq_main/r/partition_range.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_rename_longfilename.result b/storage/eloq/mysql-test/eloq_main/r/partition_rename_longfilename.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_rename_longfilename.result rename to storage/eloq/mysql-test/eloq_main/r/partition_rename_longfilename.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_symlink.result b/storage/eloq/mysql-test/eloq_main/r/partition_symlink.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_symlink.result rename to storage/eloq/mysql-test/eloq_main/r/partition_symlink.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_sync.result b/storage/eloq/mysql-test/eloq_main/r/partition_sync.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_sync.result rename to storage/eloq/mysql-test/eloq_main/r/partition_sync.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_truncate.result b/storage/eloq/mysql-test/eloq_main/r/partition_truncate.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_truncate.result rename to storage/eloq/mysql-test/eloq_main/r/partition_truncate.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_ucs2.result b/storage/eloq/mysql-test/eloq_main/r/partition_ucs2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_ucs2.result rename to storage/eloq/mysql-test/eloq_main/r/partition_ucs2.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_utf8-debug.result b/storage/eloq/mysql-test/eloq_main/r/partition_utf8-debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_utf8-debug.result rename to storage/eloq/mysql-test/eloq_main/r/partition_utf8-debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_utf8.result b/storage/eloq/mysql-test/eloq_main/r/partition_utf8.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_utf8.result rename to storage/eloq/mysql-test/eloq_main/r/partition_utf8.result diff --git a/storage/eloq/mysql-test/mono_main/r/partition_windows.result b/storage/eloq/mysql-test/eloq_main/r/partition_windows.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/partition_windows.result rename to storage/eloq/mysql-test/eloq_main/r/partition_windows.result diff --git a/storage/eloq/mysql-test/mono_main/r/password_expiration.result b/storage/eloq/mysql-test/eloq_main/r/password_expiration.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/password_expiration.result rename to storage/eloq/mysql-test/eloq_main/r/password_expiration.result diff --git a/storage/eloq/mysql-test/mono_main/r/password_expiration_unix_socket.result b/storage/eloq/mysql-test/eloq_main/r/password_expiration_unix_socket.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/password_expiration_unix_socket.result rename to storage/eloq/mysql-test/eloq_main/r/password_expiration_unix_socket.result diff --git a/storage/eloq/mysql-test/mono_main/r/percona_nonflushing_analyze_debug.result b/storage/eloq/mysql-test/eloq_main/r/percona_nonflushing_analyze_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/percona_nonflushing_analyze_debug.result rename to storage/eloq/mysql-test/eloq_main/r/percona_nonflushing_analyze_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/perror-win.result b/storage/eloq/mysql-test/eloq_main/r/perror-win.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/perror-win.result rename to storage/eloq/mysql-test/eloq_main/r/perror-win.result diff --git a/storage/eloq/mysql-test/mono_main/r/perror.result b/storage/eloq/mysql-test/eloq_main/r/perror.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/perror.result rename to storage/eloq/mysql-test/eloq_main/r/perror.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin.result b/storage/eloq/mysql-test/eloq_main/r/plugin.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin.result rename to storage/eloq/mysql-test/eloq_main/r/plugin.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_auth.result b/storage/eloq/mysql-test/eloq_main/r/plugin_auth.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_auth.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_auth.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_auth_qa.result b/storage/eloq/mysql-test/eloq_main/r/plugin_auth_qa.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_auth_qa.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_auth_qa.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_auth_qa_1.result b/storage/eloq/mysql-test/eloq_main/r/plugin_auth_qa_1.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_auth_qa_1.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_auth_qa_1.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_auth_qa_2.result b/storage/eloq/mysql-test/eloq_main/r/plugin_auth_qa_2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_auth_qa_2.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_auth_qa_2.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_auth_qa_3.result b/storage/eloq/mysql-test/eloq_main/r/plugin_auth_qa_3.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_auth_qa_3.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_auth_qa_3.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_innodb.result b/storage/eloq/mysql-test/eloq_main/r/plugin_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_load.result b/storage/eloq/mysql-test/eloq_main/r/plugin_load.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_load.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_load.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_load_option.result b/storage/eloq/mysql-test/eloq_main/r/plugin_load_option.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_load_option.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_load_option.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_loaderr.result b/storage/eloq/mysql-test/eloq_main/r/plugin_loaderr.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_loaderr.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_loaderr.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_maturity.result b/storage/eloq/mysql-test/eloq_main/r/plugin_maturity.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_maturity.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_maturity.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_not_embedded.result b/storage/eloq/mysql-test/eloq_main/r/plugin_not_embedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_not_embedded.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_not_embedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/plugin_vars.result b/storage/eloq/mysql-test/eloq_main/r/plugin_vars.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/plugin_vars.result rename to storage/eloq/mysql-test/eloq_main/r/plugin_vars.result diff --git a/storage/eloq/mysql-test/mono_main/r/pool_of_threads.result b/storage/eloq/mysql-test/eloq_main/r/pool_of_threads.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/pool_of_threads.result rename to storage/eloq/mysql-test/eloq_main/r/pool_of_threads.result diff --git a/storage/eloq/mysql-test/mono_main/r/precedence.result b/storage/eloq/mysql-test/eloq_main/r/precedence.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/precedence.result rename to storage/eloq/mysql-test/eloq_main/r/precedence.result diff --git a/storage/eloq/mysql-test/mono_main/r/precedence_bugs.result b/storage/eloq/mysql-test/eloq_main/r/precedence_bugs.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/precedence_bugs.result rename to storage/eloq/mysql-test/eloq_main/r/precedence_bugs.result diff --git a/storage/eloq/mysql-test/mono_main/r/preload.result b/storage/eloq/mysql-test/eloq_main/r/preload.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/preload.result rename to storage/eloq/mysql-test/eloq_main/r/preload.result diff --git a/storage/eloq/mysql-test/mono_main/r/prepare.result b/storage/eloq/mysql-test/eloq_main/r/prepare.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/prepare.result rename to storage/eloq/mysql-test/eloq_main/r/prepare.result diff --git a/storage/eloq/mysql-test/mono_main/r/processlist.result b/storage/eloq/mysql-test/eloq_main/r/processlist.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/processlist.result rename to storage/eloq/mysql-test/eloq_main/r/processlist.result diff --git a/storage/eloq/mysql-test/mono_main/r/processlist_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/processlist_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/processlist_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/processlist_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/profiling.result b/storage/eloq/mysql-test/eloq_main/r/profiling.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/profiling.result rename to storage/eloq/mysql-test/eloq_main/r/profiling.result diff --git a/storage/eloq/mysql-test/mono_main/r/progress_976225.result b/storage/eloq/mysql-test/eloq_main/r/progress_976225.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/progress_976225.result rename to storage/eloq/mysql-test/eloq_main/r/progress_976225.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps.result b/storage/eloq/mysql-test/eloq_main/r/ps.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps.result rename to storage/eloq/mysql-test/eloq_main/r/ps.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_10nestset.result b/storage/eloq/mysql-test/eloq_main/r/ps_10nestset.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_10nestset.result rename to storage/eloq/mysql-test/eloq_main/r/ps_10nestset.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_11bugs.result b/storage/eloq/mysql-test/eloq_main/r/ps_11bugs.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_11bugs.result rename to storage/eloq/mysql-test/eloq_main/r/ps_11bugs.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_1general.result b/storage/eloq/mysql-test/eloq_main/r/ps_1general.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_1general.result rename to storage/eloq/mysql-test/eloq_main/r/ps_1general.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_2myisam.result b/storage/eloq/mysql-test/eloq_main/r/ps_2myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_2myisam.result rename to storage/eloq/mysql-test/eloq_main/r/ps_2myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_3innodb.result b/storage/eloq/mysql-test/eloq_main/r/ps_3innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_3innodb.result rename to storage/eloq/mysql-test/eloq_main/r/ps_3innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_4heap.result b/storage/eloq/mysql-test/eloq_main/r/ps_4heap.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_4heap.result rename to storage/eloq/mysql-test/eloq_main/r/ps_4heap.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_5merge.result b/storage/eloq/mysql-test/eloq_main/r/ps_5merge.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_5merge.result rename to storage/eloq/mysql-test/eloq_main/r/ps_5merge.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_change_master.result b/storage/eloq/mysql-test/eloq_main/r/ps_change_master.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_change_master.result rename to storage/eloq/mysql-test/eloq_main/r/ps_change_master.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_ddl.result b/storage/eloq/mysql-test/eloq_main/r/ps_ddl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_ddl.result rename to storage/eloq/mysql-test/eloq_main/r/ps_ddl.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_ddl1.result b/storage/eloq/mysql-test/eloq_main/r/ps_ddl1.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_ddl1.result rename to storage/eloq/mysql-test/eloq_main/r/ps_ddl1.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_error.result b/storage/eloq/mysql-test/eloq_main/r/ps_error.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_error.result rename to storage/eloq/mysql-test/eloq_main/r/ps_error.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_grant.result b/storage/eloq/mysql-test/eloq_main/r/ps_grant.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_grant.result rename to storage/eloq/mysql-test/eloq_main/r/ps_grant.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_innodb.result b/storage/eloq/mysql-test/eloq_main/r/ps_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/ps_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_max_subselect-5113.result b/storage/eloq/mysql-test/eloq_main/r/ps_max_subselect-5113.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_max_subselect-5113.result rename to storage/eloq/mysql-test/eloq_main/r/ps_max_subselect-5113.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_missed_cmds.result b/storage/eloq/mysql-test/eloq_main/r/ps_missed_cmds.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_missed_cmds.result rename to storage/eloq/mysql-test/eloq_main/r/ps_missed_cmds.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_missed_cmds_bin_prot.result b/storage/eloq/mysql-test/eloq_main/r/ps_missed_cmds_bin_prot.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_missed_cmds_bin_prot.result rename to storage/eloq/mysql-test/eloq_main/r/ps_missed_cmds_bin_prot.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_missed_cmds_bin_prot_not_embedded.result b/storage/eloq/mysql-test/eloq_main/r/ps_missed_cmds_bin_prot_not_embedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_missed_cmds_bin_prot_not_embedded.result rename to storage/eloq/mysql-test/eloq_main/r/ps_missed_cmds_bin_prot_not_embedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_missed_cmds_not_embedded.result b/storage/eloq/mysql-test/eloq_main/r/ps_missed_cmds_not_embedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_missed_cmds_not_embedded.result rename to storage/eloq/mysql-test/eloq_main/r/ps_missed_cmds_not_embedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_not_windows.result b/storage/eloq/mysql-test/eloq_main/r/ps_not_windows.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_not_windows.result rename to storage/eloq/mysql-test/eloq_main/r/ps_not_windows.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_qc_innodb.result b/storage/eloq/mysql-test/eloq_main/r/ps_qc_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_qc_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/ps_qc_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/ps_show_log.result b/storage/eloq/mysql-test/eloq_main/r/ps_show_log.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ps_show_log.result rename to storage/eloq/mysql-test/eloq_main/r/ps_show_log.result diff --git a/storage/eloq/mysql-test/mono_main/r/query_cache.result b/storage/eloq/mysql-test/eloq_main/r/query_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/query_cache.result rename to storage/eloq/mysql-test/eloq_main/r/query_cache.result diff --git a/storage/eloq/mysql-test/mono_main/r/query_cache_28249.result b/storage/eloq/mysql-test/eloq_main/r/query_cache_28249.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/query_cache_28249.result rename to storage/eloq/mysql-test/eloq_main/r/query_cache_28249.result diff --git a/storage/eloq/mysql-test/mono_main/r/query_cache_debug.result b/storage/eloq/mysql-test/eloq_main/r/query_cache_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/query_cache_debug.result rename to storage/eloq/mysql-test/eloq_main/r/query_cache_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/query_cache_innodb.result b/storage/eloq/mysql-test/eloq_main/r/query_cache_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/query_cache_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/query_cache_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/query_cache_merge.result b/storage/eloq/mysql-test/eloq_main/r/query_cache_merge.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/query_cache_merge.result rename to storage/eloq/mysql-test/eloq_main/r/query_cache_merge.result diff --git a/storage/eloq/mysql-test/mono_main/r/query_cache_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/query_cache_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/query_cache_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/query_cache_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/query_cache_ps_no_prot.result b/storage/eloq/mysql-test/eloq_main/r/query_cache_ps_no_prot.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/query_cache_ps_no_prot.result rename to storage/eloq/mysql-test/eloq_main/r/query_cache_ps_no_prot.result diff --git a/storage/eloq/mysql-test/mono_main/r/query_cache_ps_ps_prot.result b/storage/eloq/mysql-test/eloq_main/r/query_cache_ps_ps_prot.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/query_cache_ps_ps_prot.result rename to storage/eloq/mysql-test/eloq_main/r/query_cache_ps_ps_prot.result diff --git a/storage/eloq/mysql-test/mono_main/r/query_cache_with_views.result b/storage/eloq/mysql-test/eloq_main/r/query_cache_with_views.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/query_cache_with_views.result rename to storage/eloq/mysql-test/eloq_main/r/query_cache_with_views.result diff --git a/storage/eloq/mysql-test/mono_main/r/quick_select_4161.result b/storage/eloq/mysql-test/eloq_main/r/quick_select_4161.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/quick_select_4161.result rename to storage/eloq/mysql-test/eloq_main/r/quick_select_4161.result diff --git a/storage/eloq/mysql-test/mono_main/r/range.result b/storage/eloq/mysql-test/eloq_main/r/range.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/range.result rename to storage/eloq/mysql-test/eloq_main/r/range.result diff --git a/storage/eloq/mysql-test/mono_main/r/range_debug.result b/storage/eloq/mysql-test/eloq_main/r/range_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/range_debug.result rename to storage/eloq/mysql-test/eloq_main/r/range_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/range_innodb.result b/storage/eloq/mysql-test/eloq_main/r/range_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/range_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/range_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/range_interrupted-13751.result b/storage/eloq/mysql-test/eloq_main/r/range_interrupted-13751.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/range_interrupted-13751.result rename to storage/eloq/mysql-test/eloq_main/r/range_interrupted-13751.result diff --git a/storage/eloq/mysql-test/mono_main/r/range_mrr_icp.result b/storage/eloq/mysql-test/eloq_main/r/range_mrr_icp.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/range_mrr_icp.result rename to storage/eloq/mysql-test/eloq_main/r/range_mrr_icp.result diff --git a/storage/eloq/mysql-test/mono_main/r/range_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/range_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/range_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/range_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/range_vs_index_merge.result b/storage/eloq/mysql-test/eloq_main/r/range_vs_index_merge.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/range_vs_index_merge.result rename to storage/eloq/mysql-test/eloq_main/r/range_vs_index_merge.result diff --git a/storage/eloq/mysql-test/mono_main/r/range_vs_index_merge_innodb.result b/storage/eloq/mysql-test/eloq_main/r/range_vs_index_merge_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/range_vs_index_merge_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/range_vs_index_merge_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/read_many_rows_innodb.result b/storage/eloq/mysql-test/eloq_main/r/read_many_rows_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/read_many_rows_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/read_many_rows_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/read_only.result b/storage/eloq/mysql-test/eloq_main/r/read_only.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/read_only.result rename to storage/eloq/mysql-test/eloq_main/r/read_only.result diff --git a/storage/eloq/mysql-test/mono_main/r/read_only_innodb.result b/storage/eloq/mysql-test/eloq_main/r/read_only_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/read_only_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/read_only_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/rename.result b/storage/eloq/mysql-test/eloq_main/r/rename.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/rename.result rename to storage/eloq/mysql-test/eloq_main/r/rename.result diff --git a/storage/eloq/mysql-test/mono_main/r/renamedb.result b/storage/eloq/mysql-test/eloq_main/r/renamedb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/renamedb.result rename to storage/eloq/mysql-test/eloq_main/r/renamedb.result diff --git a/storage/eloq/mysql-test/mono_main/r/reopen_temp_table.result b/storage/eloq/mysql-test/eloq_main/r/reopen_temp_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/reopen_temp_table.result rename to storage/eloq/mysql-test/eloq_main/r/reopen_temp_table.result diff --git a/storage/eloq/mysql-test/mono_main/r/repair.result b/storage/eloq/mysql-test/eloq_main/r/repair.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/repair.result rename to storage/eloq/mysql-test/eloq_main/r/repair.result diff --git a/storage/eloq/mysql-test/mono_main/r/repair_symlink-5543.result b/storage/eloq/mysql-test/eloq_main/r/repair_symlink-5543.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/repair_symlink-5543.result rename to storage/eloq/mysql-test/eloq_main/r/repair_symlink-5543.result diff --git a/storage/eloq/mysql-test/mono_main/r/replace.result b/storage/eloq/mysql-test/eloq_main/r/replace.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/replace.result rename to storage/eloq/mysql-test/eloq_main/r/replace.result diff --git a/storage/eloq/mysql-test/mono_main/r/replace_returning.result b/storage/eloq/mysql-test/eloq_main/r/replace_returning.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/replace_returning.result rename to storage/eloq/mysql-test/eloq_main/r/replace_returning.result diff --git a/storage/eloq/mysql-test/mono_main/r/replace_returning_datatypes.result b/storage/eloq/mysql-test/eloq_main/r/replace_returning_datatypes.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/replace_returning_datatypes.result rename to storage/eloq/mysql-test/eloq_main/r/replace_returning_datatypes.result diff --git a/storage/eloq/mysql-test/mono_main/r/replace_returning_err.result b/storage/eloq/mysql-test/eloq_main/r/replace_returning_err.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/replace_returning_err.result rename to storage/eloq/mysql-test/eloq_main/r/replace_returning_err.result diff --git a/storage/eloq/mysql-test/mono_main/r/require_secure_transport.result b/storage/eloq/mysql-test/eloq_main/r/require_secure_transport.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/require_secure_transport.result rename to storage/eloq/mysql-test/eloq_main/r/require_secure_transport.result diff --git a/storage/eloq/mysql-test/mono_main/r/reset_connection.result b/storage/eloq/mysql-test/eloq_main/r/reset_connection.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/reset_connection.result rename to storage/eloq/mysql-test/eloq_main/r/reset_connection.result diff --git a/storage/eloq/mysql-test/mono_main/r/rollback.result b/storage/eloq/mysql-test/eloq_main/r/rollback.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/rollback.result rename to storage/eloq/mysql-test/eloq_main/r/rollback.result diff --git a/storage/eloq/mysql-test/mono_main/r/round.result b/storage/eloq/mysql-test/eloq_main/r/round.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/round.result rename to storage/eloq/mysql-test/eloq_main/r/round.result diff --git a/storage/eloq/mysql-test/mono_main/r/row-checksum-old.result b/storage/eloq/mysql-test/eloq_main/r/row-checksum-old.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/row-checksum-old.result rename to storage/eloq/mysql-test/eloq_main/r/row-checksum-old.result diff --git a/storage/eloq/mysql-test/mono_main/r/row-checksum.result b/storage/eloq/mysql-test/eloq_main/r/row-checksum.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/row-checksum.result rename to storage/eloq/mysql-test/eloq_main/r/row-checksum.result diff --git a/storage/eloq/mysql-test/mono_main/r/row.result b/storage/eloq/mysql-test/eloq_main/r/row.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/row.result rename to storage/eloq/mysql-test/eloq_main/r/row.result diff --git a/storage/eloq/mysql-test/mono_main/r/rowid_filter.result b/storage/eloq/mysql-test/eloq_main/r/rowid_filter.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/rowid_filter.result rename to storage/eloq/mysql-test/eloq_main/r/rowid_filter.result diff --git a/storage/eloq/mysql-test/mono_main/r/rowid_filter_innodb.result b/storage/eloq/mysql-test/eloq_main/r/rowid_filter_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/rowid_filter_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/rowid_filter_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/rowid_filter_innodb_debug.result b/storage/eloq/mysql-test/eloq_main/r/rowid_filter_innodb_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/rowid_filter_innodb_debug.result rename to storage/eloq/mysql-test/eloq_main/r/rowid_filter_innodb_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/rowid_filter_myisam.result b/storage/eloq/mysql-test/eloq_main/r/rowid_filter_myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/rowid_filter_myisam.result rename to storage/eloq/mysql-test/eloq_main/r/rowid_filter_myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/rowid_filter_myisam_debug.result b/storage/eloq/mysql-test/eloq_main/r/rowid_filter_myisam_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/rowid_filter_myisam_debug.result rename to storage/eloq/mysql-test/eloq_main/r/rowid_filter_myisam_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/rowid_order_innodb.result b/storage/eloq/mysql-test/eloq_main/r/rowid_order_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/rowid_order_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/rowid_order_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/rownum.result b/storage/eloq/mysql-test/eloq_main/r/rownum.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/rownum.result rename to storage/eloq/mysql-test/eloq_main/r/rownum.result diff --git a/storage/eloq/mysql-test/mono_main/r/rpl_mysql_upgrade_slave_repo_check.result b/storage/eloq/mysql-test/eloq_main/r/rpl_mysql_upgrade_slave_repo_check.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/rpl_mysql_upgrade_slave_repo_check.result rename to storage/eloq/mysql-test/eloq_main/r/rpl_mysql_upgrade_slave_repo_check.result diff --git a/storage/eloq/mysql-test/mono_main/r/rpl_mysqldump_slave.result b/storage/eloq/mysql-test/eloq_main/r/rpl_mysqldump_slave.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/rpl_mysqldump_slave.result rename to storage/eloq/mysql-test/eloq_main/r/rpl_mysqldump_slave.result diff --git a/storage/eloq/mysql-test/mono_main/r/schema.result b/storage/eloq/mysql-test/eloq_main/r/schema.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/schema.result rename to storage/eloq/mysql-test/eloq_main/r/schema.result diff --git a/storage/eloq/mysql-test/mono_main/r/second_frac-9175.result b/storage/eloq/mysql-test/eloq_main/r/second_frac-9175.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/second_frac-9175.result rename to storage/eloq/mysql-test/eloq_main/r/second_frac-9175.result diff --git a/storage/eloq/mysql-test/mono_main/r/secure_file_priv_win.result b/storage/eloq/mysql-test/eloq_main/r/secure_file_priv_win.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/secure_file_priv_win.result rename to storage/eloq/mysql-test/eloq_main/r/secure_file_priv_win.result diff --git a/storage/eloq/mysql-test/mono_main/r/select.result b/storage/eloq/mysql-test/eloq_main/r/select.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/select.result rename to storage/eloq/mysql-test/eloq_main/r/select.result diff --git a/storage/eloq/mysql-test/mono_main/r/select_debug.result b/storage/eloq/mysql-test/eloq_main/r/select_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/select_debug.result rename to storage/eloq/mysql-test/eloq_main/r/select_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/select_found.result b/storage/eloq/mysql-test/eloq_main/r/select_found.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/select_found.result rename to storage/eloq/mysql-test/eloq_main/r/select_found.result diff --git a/storage/eloq/mysql-test/mono_main/r/select_jcl6.result b/storage/eloq/mysql-test/eloq_main/r/select_jcl6.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/select_jcl6.result rename to storage/eloq/mysql-test/eloq_main/r/select_jcl6.result diff --git a/storage/eloq/mysql-test/mono_main/r/select_pkeycache.result b/storage/eloq/mysql-test/eloq_main/r/select_pkeycache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/select_pkeycache.result rename to storage/eloq/mysql-test/eloq_main/r/select_pkeycache.result diff --git a/storage/eloq/mysql-test/mono_main/r/select_safe.result b/storage/eloq/mysql-test/eloq_main/r/select_safe.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/select_safe.result rename to storage/eloq/mysql-test/eloq_main/r/select_safe.result diff --git a/storage/eloq/mysql-test/mono_main/r/selectivity.result b/storage/eloq/mysql-test/eloq_main/r/selectivity.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/selectivity.result rename to storage/eloq/mysql-test/eloq_main/r/selectivity.result diff --git a/storage/eloq/mysql-test/mono_main/r/selectivity_innodb.result b/storage/eloq/mysql-test/eloq_main/r/selectivity_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/selectivity_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/selectivity_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/selectivity_no_engine.result b/storage/eloq/mysql-test/eloq_main/r/selectivity_no_engine.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/selectivity_no_engine.result rename to storage/eloq/mysql-test/eloq_main/r/selectivity_no_engine.result diff --git a/storage/eloq/mysql-test/mono_main/r/servers.result b/storage/eloq/mysql-test/eloq_main/r/servers.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/servers.result rename to storage/eloq/mysql-test/eloq_main/r/servers.result diff --git a/storage/eloq/mysql-test/mono_main/r/session_tracker_last_gtid.result b/storage/eloq/mysql-test/eloq_main/r/session_tracker_last_gtid.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/session_tracker_last_gtid.result rename to storage/eloq/mysql-test/eloq_main/r/session_tracker_last_gtid.result diff --git a/storage/eloq/mysql-test/mono_main/r/set_operation.result b/storage/eloq/mysql-test/eloq_main/r/set_operation.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/set_operation.result rename to storage/eloq/mysql-test/eloq_main/r/set_operation.result diff --git a/storage/eloq/mysql-test/mono_main/r/set_operation_oracle.result b/storage/eloq/mysql-test/eloq_main/r/set_operation_oracle.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/set_operation_oracle.result rename to storage/eloq/mysql-test/eloq_main/r/set_operation_oracle.result diff --git a/storage/eloq/mysql-test/mono_main/r/set_password.result b/storage/eloq/mysql-test/eloq_main/r/set_password.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/set_password.result rename to storage/eloq/mysql-test/eloq_main/r/set_password.result diff --git a/storage/eloq/mysql-test/mono_main/r/set_statement.result b/storage/eloq/mysql-test/eloq_main/r/set_statement.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/set_statement.result rename to storage/eloq/mysql-test/eloq_main/r/set_statement.result diff --git a/storage/eloq/mysql-test/mono_main/r/set_statement_debug.result b/storage/eloq/mysql-test/eloq_main/r/set_statement_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/set_statement_debug.result rename to storage/eloq/mysql-test/eloq_main/r/set_statement_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/set_statement_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/set_statement_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/set_statement_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/set_statement_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/set_statement_notembedded_binlog.result b/storage/eloq/mysql-test/eloq_main/r/set_statement_notembedded_binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/set_statement_notembedded_binlog.result rename to storage/eloq/mysql-test/eloq_main/r/set_statement_notembedded_binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/set_statement_profiling.result b/storage/eloq/mysql-test/eloq_main/r/set_statement_profiling.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/set_statement_profiling.result rename to storage/eloq/mysql-test/eloq_main/r/set_statement_profiling.result diff --git a/storage/eloq/mysql-test/mono_main/r/show.result b/storage/eloq/mysql-test/eloq_main/r/show.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/show.result rename to storage/eloq/mysql-test/eloq_main/r/show.result diff --git a/storage/eloq/mysql-test/mono_main/r/show_bad_definer-5553.result b/storage/eloq/mysql-test/eloq_main/r/show_bad_definer-5553.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/show_bad_definer-5553.result rename to storage/eloq/mysql-test/eloq_main/r/show_bad_definer-5553.result diff --git a/storage/eloq/mysql-test/mono_main/r/show_check.result b/storage/eloq/mysql-test/eloq_main/r/show_check.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/show_check.result rename to storage/eloq/mysql-test/eloq_main/r/show_check.result diff --git a/storage/eloq/mysql-test/mono_main/r/show_create_user.result b/storage/eloq/mysql-test/eloq_main/r/show_create_user.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/show_create_user.result rename to storage/eloq/mysql-test/eloq_main/r/show_create_user.result diff --git a/storage/eloq/mysql-test/mono_main/r/show_explain.result b/storage/eloq/mysql-test/eloq_main/r/show_explain.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/show_explain.result rename to storage/eloq/mysql-test/eloq_main/r/show_explain.result diff --git a/storage/eloq/mysql-test/mono_main/r/show_explain_non_select.result b/storage/eloq/mysql-test/eloq_main/r/show_explain_non_select.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/show_explain_non_select.result rename to storage/eloq/mysql-test/eloq_main/r/show_explain_non_select.result diff --git a/storage/eloq/mysql-test/mono_main/r/show_explain_ps.result b/storage/eloq/mysql-test/eloq_main/r/show_explain_ps.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/show_explain_ps.result rename to storage/eloq/mysql-test/eloq_main/r/show_explain_ps.result diff --git a/storage/eloq/mysql-test/mono_main/r/show_function_with_pad_char_to_full_length.result b/storage/eloq/mysql-test/eloq_main/r/show_function_with_pad_char_to_full_length.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/show_function_with_pad_char_to_full_length.result rename to storage/eloq/mysql-test/eloq_main/r/show_function_with_pad_char_to_full_length.result diff --git a/storage/eloq/mysql-test/mono_main/r/show_profile.result b/storage/eloq/mysql-test/eloq_main/r/show_profile.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/show_profile.result rename to storage/eloq/mysql-test/eloq_main/r/show_profile.result diff --git a/storage/eloq/mysql-test/mono_main/r/show_row_order-9226.result b/storage/eloq/mysql-test/eloq_main/r/show_row_order-9226.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/show_row_order-9226.result rename to storage/eloq/mysql-test/eloq_main/r/show_row_order-9226.result diff --git a/storage/eloq/mysql-test/mono_main/r/shutdown.result b/storage/eloq/mysql-test/eloq_main/r/shutdown.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/shutdown.result rename to storage/eloq/mysql-test/eloq_main/r/shutdown.result diff --git a/storage/eloq/mysql-test/mono_main/r/shutdown_not_windows.result b/storage/eloq/mysql-test/eloq_main/r/shutdown_not_windows.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/shutdown_not_windows.result rename to storage/eloq/mysql-test/eloq_main/r/shutdown_not_windows.result diff --git a/storage/eloq/mysql-test/mono_main/r/sighup-6580.result b/storage/eloq/mysql-test/eloq_main/r/sighup-6580.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sighup-6580.result rename to storage/eloq/mysql-test/eloq_main/r/sighup-6580.result diff --git a/storage/eloq/mysql-test/mono_main/r/signal.result b/storage/eloq/mysql-test/eloq_main/r/signal.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/signal.result rename to storage/eloq/mysql-test/eloq_main/r/signal.result diff --git a/storage/eloq/mysql-test/mono_main/r/signal_code.result b/storage/eloq/mysql-test/eloq_main/r/signal_code.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/signal_code.result rename to storage/eloq/mysql-test/eloq_main/r/signal_code.result diff --git a/storage/eloq/mysql-test/mono_main/r/signal_demo1.result b/storage/eloq/mysql-test/eloq_main/r/signal_demo1.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/signal_demo1.result rename to storage/eloq/mysql-test/eloq_main/r/signal_demo1.result diff --git a/storage/eloq/mysql-test/mono_main/r/signal_demo2.result b/storage/eloq/mysql-test/eloq_main/r/signal_demo2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/signal_demo2.result rename to storage/eloq/mysql-test/eloq_main/r/signal_demo2.result diff --git a/storage/eloq/mysql-test/mono_main/r/signal_demo3.result b/storage/eloq/mysql-test/eloq_main/r/signal_demo3.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/signal_demo3.result rename to storage/eloq/mysql-test/eloq_main/r/signal_demo3.result diff --git a/storage/eloq/mysql-test/mono_main/r/signal_sqlmode.result b/storage/eloq/mysql-test/eloq_main/r/signal_sqlmode.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/signal_sqlmode.result rename to storage/eloq/mysql-test/eloq_main/r/signal_sqlmode.result diff --git a/storage/eloq/mysql-test/mono_main/r/simultaneous_assignment.result b/storage/eloq/mysql-test/eloq_main/r/simultaneous_assignment.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/simultaneous_assignment.result rename to storage/eloq/mysql-test/eloq_main/r/simultaneous_assignment.result diff --git a/storage/eloq/mysql-test/mono_main/r/single_delete_update.result b/storage/eloq/mysql-test/eloq_main/r/single_delete_update.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/single_delete_update.result rename to storage/eloq/mysql-test/eloq_main/r/single_delete_update.result diff --git a/storage/eloq/mysql-test/mono_main/r/single_delete_update_innodb.result b/storage/eloq/mysql-test/eloq_main/r/single_delete_update_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/single_delete_update_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/single_delete_update_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/skip_grants.result b/storage/eloq/mysql-test/eloq_main/r/skip_grants.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/skip_grants.result rename to storage/eloq/mysql-test/eloq_main/r/skip_grants.result diff --git a/storage/eloq/mysql-test/mono_main/r/skip_log_bin.result b/storage/eloq/mysql-test/eloq_main/r/skip_log_bin.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/skip_log_bin.result rename to storage/eloq/mysql-test/eloq_main/r/skip_log_bin.result diff --git a/storage/eloq/mysql-test/mono_main/r/skip_name_resolve.result b/storage/eloq/mysql-test/eloq_main/r/skip_name_resolve.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/skip_name_resolve.result rename to storage/eloq/mysql-test/eloq_main/r/skip_name_resolve.result diff --git a/storage/eloq/mysql-test/mono_main/r/slowlog_enospace-10508.result b/storage/eloq/mysql-test/eloq_main/r/slowlog_enospace-10508.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/slowlog_enospace-10508.result rename to storage/eloq/mysql-test/eloq_main/r/slowlog_enospace-10508.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-anchor-row-type-cursor.result b/storage/eloq/mysql-test/eloq_main/r/sp-anchor-row-type-cursor.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-anchor-row-type-cursor.result rename to storage/eloq/mysql-test/eloq_main/r/sp-anchor-row-type-cursor.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-anchor-row-type-table.result b/storage/eloq/mysql-test/eloq_main/r/sp-anchor-row-type-table.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-anchor-row-type-table.result rename to storage/eloq/mysql-test/eloq_main/r/sp-anchor-row-type-table.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-anchor-type.result b/storage/eloq/mysql-test/eloq_main/r/sp-anchor-type.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-anchor-type.result rename to storage/eloq/mysql-test/eloq_main/r/sp-anchor-type.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-big.result b/storage/eloq/mysql-test/eloq_main/r/sp-big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-big.result rename to storage/eloq/mysql-test/eloq_main/r/sp-big.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-bugs.result b/storage/eloq/mysql-test/eloq_main/r/sp-bugs.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-bugs.result rename to storage/eloq/mysql-test/eloq_main/r/sp-bugs.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-bugs2.result b/storage/eloq/mysql-test/eloq_main/r/sp-bugs2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-bugs2.result rename to storage/eloq/mysql-test/eloq_main/r/sp-bugs2.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-code.result b/storage/eloq/mysql-test/eloq_main/r/sp-code.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-code.result rename to storage/eloq/mysql-test/eloq_main/r/sp-code.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-condition-handler.result b/storage/eloq/mysql-test/eloq_main/r/sp-condition-handler.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-condition-handler.result rename to storage/eloq/mysql-test/eloq_main/r/sp-condition-handler.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-cursor.result b/storage/eloq/mysql-test/eloq_main/r/sp-cursor.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-cursor.result rename to storage/eloq/mysql-test/eloq_main/r/sp-cursor.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-destruct.result b/storage/eloq/mysql-test/eloq_main/r/sp-destruct.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-destruct.result rename to storage/eloq/mysql-test/eloq_main/r/sp-destruct.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-dynamic.result b/storage/eloq/mysql-test/eloq_main/r/sp-dynamic.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-dynamic.result rename to storage/eloq/mysql-test/eloq_main/r/sp-dynamic.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-error.result b/storage/eloq/mysql-test/eloq_main/r/sp-error.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-error.result rename to storage/eloq/mysql-test/eloq_main/r/sp-error.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-expr.result b/storage/eloq/mysql-test/eloq_main/r/sp-expr.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-expr.result rename to storage/eloq/mysql-test/eloq_main/r/sp-expr.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-fib.result b/storage/eloq/mysql-test/eloq_main/r/sp-fib.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-fib.result rename to storage/eloq/mysql-test/eloq_main/r/sp-fib.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-for-loop.result b/storage/eloq/mysql-test/eloq_main/r/sp-for-loop.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-for-loop.result rename to storage/eloq/mysql-test/eloq_main/r/sp-for-loop.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-group.result b/storage/eloq/mysql-test/eloq_main/r/sp-group.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-group.result rename to storage/eloq/mysql-test/eloq_main/r/sp-group.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-innodb.result b/storage/eloq/mysql-test/eloq_main/r/sp-innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-innodb.result rename to storage/eloq/mysql-test/eloq_main/r/sp-innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-lock.result b/storage/eloq/mysql-test/eloq_main/r/sp-lock.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-lock.result rename to storage/eloq/mysql-test/eloq_main/r/sp-lock.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-no-code.result b/storage/eloq/mysql-test/eloq_main/r/sp-no-code.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-no-code.result rename to storage/eloq/mysql-test/eloq_main/r/sp-no-code.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-no-valgrind.result b/storage/eloq/mysql-test/eloq_main/r/sp-no-valgrind.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-no-valgrind.result rename to storage/eloq/mysql-test/eloq_main/r/sp-no-valgrind.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-prelocking.result b/storage/eloq/mysql-test/eloq_main/r/sp-prelocking.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-prelocking.result rename to storage/eloq/mysql-test/eloq_main/r/sp-prelocking.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-row.result b/storage/eloq/mysql-test/eloq_main/r/sp-row.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-row.result rename to storage/eloq/mysql-test/eloq_main/r/sp-row.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-security-anchor-type.result b/storage/eloq/mysql-test/eloq_main/r/sp-security-anchor-type.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-security-anchor-type.result rename to storage/eloq/mysql-test/eloq_main/r/sp-security-anchor-type.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-security.result b/storage/eloq/mysql-test/eloq_main/r/sp-security.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-security.result rename to storage/eloq/mysql-test/eloq_main/r/sp-security.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-threads.result b/storage/eloq/mysql-test/eloq_main/r/sp-threads.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-threads.result rename to storage/eloq/mysql-test/eloq_main/r/sp-threads.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-ucs2.result b/storage/eloq/mysql-test/eloq_main/r/sp-ucs2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-ucs2.result rename to storage/eloq/mysql-test/eloq_main/r/sp-ucs2.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp-vars.result b/storage/eloq/mysql-test/eloq_main/r/sp-vars.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp-vars.result rename to storage/eloq/mysql-test/eloq_main/r/sp-vars.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp.result b/storage/eloq/mysql-test/eloq_main/r/sp.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp.result rename to storage/eloq/mysql-test/eloq_main/r/sp.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp2.result b/storage/eloq/mysql-test/eloq_main/r/sp2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp2.result rename to storage/eloq/mysql-test/eloq_main/r/sp2.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp_gis.result b/storage/eloq/mysql-test/eloq_main/r/sp_gis.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp_gis.result rename to storage/eloq/mysql-test/eloq_main/r/sp_gis.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp_missing_4665.result b/storage/eloq/mysql-test/eloq_main/r/sp_missing_4665.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp_missing_4665.result rename to storage/eloq/mysql-test/eloq_main/r/sp_missing_4665.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/sp_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/sp_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp_stress_case.result b/storage/eloq/mysql-test/eloq_main/r/sp_stress_case.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp_stress_case.result rename to storage/eloq/mysql-test/eloq_main/r/sp_stress_case.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp_sync.result b/storage/eloq/mysql-test/eloq_main/r/sp_sync.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp_sync.result rename to storage/eloq/mysql-test/eloq_main/r/sp_sync.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp_trans.result b/storage/eloq/mysql-test/eloq_main/r/sp_trans.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp_trans.result rename to storage/eloq/mysql-test/eloq_main/r/sp_trans.result diff --git a/storage/eloq/mysql-test/mono_main/r/sp_trans_log.result b/storage/eloq/mysql-test/eloq_main/r/sp_trans_log.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sp_trans_log.result rename to storage/eloq/mysql-test/eloq_main/r/sp_trans_log.result diff --git a/storage/eloq/mysql-test/mono_main/r/sql_mode.result b/storage/eloq/mysql-test/eloq_main/r/sql_mode.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sql_mode.result rename to storage/eloq/mysql-test/eloq_main/r/sql_mode.result diff --git a/storage/eloq/mysql-test/mono_main/r/sql_safe_updates.result b/storage/eloq/mysql-test/eloq_main/r/sql_safe_updates.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sql_safe_updates.result rename to storage/eloq/mysql-test/eloq_main/r/sql_safe_updates.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl-big.result b/storage/eloq/mysql-test/eloq_main/r/ssl-big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl-big.result rename to storage/eloq/mysql-test/eloq_main/r/ssl-big.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl.result b/storage/eloq/mysql-test/eloq_main/r/ssl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl.result rename to storage/eloq/mysql-test/eloq_main/r/ssl.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_7937,nossl.result b/storage/eloq/mysql-test/eloq_main/r/ssl_7937,nossl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_7937,nossl.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_7937,nossl.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_7937.result b/storage/eloq/mysql-test/eloq_main/r/ssl_7937.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_7937.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_7937.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_8k_key.result b/storage/eloq/mysql-test/eloq_main/r/ssl_8k_key.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_8k_key.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_8k_key.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_and_innodb.result b/storage/eloq/mysql-test/eloq_main/r/ssl_and_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_and_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_and_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_ca.result b/storage/eloq/mysql-test/eloq_main/r/ssl_ca.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_ca.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_ca.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_cipher.result b/storage/eloq/mysql-test/eloq_main/r/ssl_cipher.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_cipher.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_cipher.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_compress.result b/storage/eloq/mysql-test/eloq_main/r/ssl_compress.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_compress.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_compress.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_connect.result b/storage/eloq/mysql-test/eloq_main/r/ssl_connect.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_connect.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_connect.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_crl.result b/storage/eloq/mysql-test/eloq_main/r/ssl_crl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_crl.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_crl.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_crl_clients.result b/storage/eloq/mysql-test/eloq_main/r/ssl_crl_clients.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_crl_clients.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_crl_clients.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_system_ca,bad.result b/storage/eloq/mysql-test/eloq_main/r/ssl_system_ca,bad.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_system_ca,bad.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_system_ca,bad.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_system_ca.result b/storage/eloq/mysql-test/eloq_main/r/ssl_system_ca.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_system_ca.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_system_ca.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_timeout-9836.result b/storage/eloq/mysql-test/eloq_main/r/ssl_timeout-9836.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_timeout-9836.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_timeout-9836.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_timeout.result b/storage/eloq/mysql-test/eloq_main/r/ssl_timeout.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_timeout.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_timeout.result diff --git a/storage/eloq/mysql-test/mono_main/r/ssl_verify_ip.result b/storage/eloq/mysql-test/eloq_main/r/ssl_verify_ip.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/ssl_verify_ip.result rename to storage/eloq/mysql-test/eloq_main/r/ssl_verify_ip.result diff --git a/storage/eloq/mysql-test/mono_main/r/stack-crash.result b/storage/eloq/mysql-test/eloq_main/r/stack-crash.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stack-crash.result rename to storage/eloq/mysql-test/eloq_main/r/stack-crash.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables-enospc.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables-enospc.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables-enospc.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables-enospc.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables_disabled.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables_disabled.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables_disabled.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables_disabled.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables_innodb.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables_innodb_debug.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables_innodb_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables_innodb_debug.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables_innodb_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables_missing.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables_missing.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables_missing.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables_missing.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables_myisam_debug.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables_myisam_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables_myisam_debug.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables_myisam_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables_par.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables_par.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables_par.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables_par.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables_par_innodb.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables_par_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables_par_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables_par_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables_partition.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables_partition.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables_partition.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables_partition.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables_rbr.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables_rbr.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables_rbr.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables_rbr.result diff --git a/storage/eloq/mysql-test/mono_main/r/stat_tables_repl.result b/storage/eloq/mysql-test/eloq_main/r/stat_tables_repl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/stat_tables_repl.result rename to storage/eloq/mysql-test/eloq_main/r/stat_tables_repl.result diff --git a/storage/eloq/mysql-test/mono_main/r/statement-expr.result b/storage/eloq/mysql-test/eloq_main/r/statement-expr.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/statement-expr.result rename to storage/eloq/mysql-test/eloq_main/r/statement-expr.result diff --git a/storage/eloq/mysql-test/mono_main/r/statistics.result b/storage/eloq/mysql-test/eloq_main/r/statistics.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/statistics.result rename to storage/eloq/mysql-test/eloq_main/r/statistics.result diff --git a/storage/eloq/mysql-test/mono_main/r/statistics_close.result b/storage/eloq/mysql-test/eloq_main/r/statistics_close.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/statistics_close.result rename to storage/eloq/mysql-test/eloq_main/r/statistics_close.result diff --git a/storage/eloq/mysql-test/mono_main/r/statistics_index_crash-7362.result b/storage/eloq/mysql-test/eloq_main/r/statistics_index_crash-7362.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/statistics_index_crash-7362.result rename to storage/eloq/mysql-test/eloq_main/r/statistics_index_crash-7362.result diff --git a/storage/eloq/mysql-test/mono_main/r/status.result b/storage/eloq/mysql-test/eloq_main/r/status.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/status.result rename to storage/eloq/mysql-test/eloq_main/r/status.result diff --git a/storage/eloq/mysql-test/mono_main/r/status2.result b/storage/eloq/mysql-test/eloq_main/r/status2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/status2.result rename to storage/eloq/mysql-test/eloq_main/r/status2.result diff --git a/storage/eloq/mysql-test/mono_main/r/status_bug17954.result b/storage/eloq/mysql-test/eloq_main/r/status_bug17954.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/status_bug17954.result rename to storage/eloq/mysql-test/eloq_main/r/status_bug17954.result diff --git a/storage/eloq/mysql-test/mono_main/r/str_to_datetime_457.result b/storage/eloq/mysql-test/eloq_main/r/str_to_datetime_457.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/str_to_datetime_457.result rename to storage/eloq/mysql-test/eloq_main/r/str_to_datetime_457.result diff --git a/storage/eloq/mysql-test/mono_main/r/strict.result b/storage/eloq/mysql-test/eloq_main/r/strict.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/strict.result rename to storage/eloq/mysql-test/eloq_main/r/strict.result diff --git a/storage/eloq/mysql-test/mono_main/r/strict_autoinc_1myisam.result b/storage/eloq/mysql-test/eloq_main/r/strict_autoinc_1myisam.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/strict_autoinc_1myisam.result rename to storage/eloq/mysql-test/eloq_main/r/strict_autoinc_1myisam.result diff --git a/storage/eloq/mysql-test/mono_main/r/strict_autoinc_2innodb.result b/storage/eloq/mysql-test/eloq_main/r/strict_autoinc_2innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/strict_autoinc_2innodb.result rename to storage/eloq/mysql-test/eloq_main/r/strict_autoinc_2innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/strict_autoinc_3heap.result b/storage/eloq/mysql-test/eloq_main/r/strict_autoinc_3heap.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/strict_autoinc_3heap.result rename to storage/eloq/mysql-test/eloq_main/r/strict_autoinc_3heap.result diff --git a/storage/eloq/mysql-test/mono_main/r/strings.result b/storage/eloq/mysql-test/eloq_main/r/strings.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/strings.result rename to storage/eloq/mysql-test/eloq_main/r/strings.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect-crash_15755.result b/storage/eloq/mysql-test/eloq_main/r/subselect-crash_15755.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect-crash_15755.result rename to storage/eloq/mysql-test/eloq_main/r/subselect-crash_15755.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect.result b/storage/eloq/mysql-test/eloq_main/r/subselect.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect.result rename to storage/eloq/mysql-test/eloq_main/r/subselect.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect2.result b/storage/eloq/mysql-test/eloq_main/r/subselect2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect2.result rename to storage/eloq/mysql-test/eloq_main/r/subselect2.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect3.result b/storage/eloq/mysql-test/eloq_main/r/subselect3.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect3.result rename to storage/eloq/mysql-test/eloq_main/r/subselect3.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect3_jcl6.result b/storage/eloq/mysql-test/eloq_main/r/subselect3_jcl6.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect3_jcl6.result rename to storage/eloq/mysql-test/eloq_main/r/subselect3_jcl6.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect4.result b/storage/eloq/mysql-test/eloq_main/r/subselect4.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect4.result rename to storage/eloq/mysql-test/eloq_main/r/subselect4.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_cache.result b/storage/eloq/mysql-test/eloq_main/r/subselect_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_cache.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_cache.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_debug.result b/storage/eloq/mysql-test/eloq_main/r/subselect_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_debug.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_exists2in.result b/storage/eloq/mysql-test/eloq_main/r/subselect_exists2in.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_exists2in.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_exists2in.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_exists2in_costmat.result b/storage/eloq/mysql-test/eloq_main/r/subselect_exists2in_costmat.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_exists2in_costmat.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_exists2in_costmat.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_extra.result b/storage/eloq/mysql-test/eloq_main/r/subselect_extra.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_extra.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_extra.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_extra_no_semijoin.result b/storage/eloq/mysql-test/eloq_main/r/subselect_extra_no_semijoin.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_extra_no_semijoin.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_extra_no_semijoin.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_gis.result b/storage/eloq/mysql-test/eloq_main/r/subselect_gis.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_gis.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_gis.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_innodb.result b/storage/eloq/mysql-test/eloq_main/r/subselect_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_mat.result b/storage/eloq/mysql-test/eloq_main/r/subselect_mat.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_mat.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_mat.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_mat_cost.result b/storage/eloq/mysql-test/eloq_main/r/subselect_mat_cost.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_mat_cost.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_mat_cost.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_mat_cost_bugs.result b/storage/eloq/mysql-test/eloq_main/r/subselect_mat_cost_bugs.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_mat_cost_bugs.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_mat_cost_bugs.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_no_exists_to_in.result b/storage/eloq/mysql-test/eloq_main/r/subselect_no_exists_to_in.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_no_exists_to_in.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_no_exists_to_in.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_no_mat.result b/storage/eloq/mysql-test/eloq_main/r/subselect_no_mat.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_no_mat.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_no_mat.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_no_opts.result b/storage/eloq/mysql-test/eloq_main/r/subselect_no_opts.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_no_opts.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_no_opts.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_no_scache.result b/storage/eloq/mysql-test/eloq_main/r/subselect_no_scache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_no_scache.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_no_scache.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_no_semijoin.result b/storage/eloq/mysql-test/eloq_main/r/subselect_no_semijoin.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_no_semijoin.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_no_semijoin.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/subselect_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_nulls.result b/storage/eloq/mysql-test/eloq_main/r/subselect_nulls.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_nulls.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_nulls.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_partial_match.result b/storage/eloq/mysql-test/eloq_main/r/subselect_partial_match.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_partial_match.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_partial_match.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_sj.result b/storage/eloq/mysql-test/eloq_main/r/subselect_sj.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_sj.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_sj.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_sj2.result b/storage/eloq/mysql-test/eloq_main/r/subselect_sj2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_sj2.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_sj2.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_sj2_jcl6.result b/storage/eloq/mysql-test/eloq_main/r/subselect_sj2_jcl6.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_sj2_jcl6.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_sj2_jcl6.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_sj2_mat.result b/storage/eloq/mysql-test/eloq_main/r/subselect_sj2_mat.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_sj2_mat.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_sj2_mat.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_sj_aria.result b/storage/eloq/mysql-test/eloq_main/r/subselect_sj_aria.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_sj_aria.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_sj_aria.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_sj_jcl6.result b/storage/eloq/mysql-test/eloq_main/r/subselect_sj_jcl6.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_sj_jcl6.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_sj_jcl6.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_sj_mat.result b/storage/eloq/mysql-test/eloq_main/r/subselect_sj_mat.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_sj_mat.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_sj_mat.result diff --git a/storage/eloq/mysql-test/mono_main/r/subselect_sj_nonmerged.result b/storage/eloq/mysql-test/eloq_main/r/subselect_sj_nonmerged.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/subselect_sj_nonmerged.result rename to storage/eloq/mysql-test/eloq_main/r/subselect_sj_nonmerged.result diff --git a/storage/eloq/mysql-test/mono_main/r/sum_distinct-big.result b/storage/eloq/mysql-test/eloq_main/r/sum_distinct-big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sum_distinct-big.result rename to storage/eloq/mysql-test/eloq_main/r/sum_distinct-big.result diff --git a/storage/eloq/mysql-test/mono_main/r/sum_distinct.result b/storage/eloq/mysql-test/eloq_main/r/sum_distinct.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sum_distinct.result rename to storage/eloq/mysql-test/eloq_main/r/sum_distinct.result diff --git a/storage/eloq/mysql-test/mono_main/r/symlink-aria-11902.result b/storage/eloq/mysql-test/eloq_main/r/symlink-aria-11902.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/symlink-aria-11902.result rename to storage/eloq/mysql-test/eloq_main/r/symlink-aria-11902.result diff --git a/storage/eloq/mysql-test/mono_main/r/symlink-myisam-11902.result b/storage/eloq/mysql-test/eloq_main/r/symlink-myisam-11902.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/symlink-myisam-11902.result rename to storage/eloq/mysql-test/eloq_main/r/symlink-myisam-11902.result diff --git a/storage/eloq/mysql-test/mono_main/r/symlink.result b/storage/eloq/mysql-test/eloq_main/r/symlink.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/symlink.result rename to storage/eloq/mysql-test/eloq_main/r/symlink.result diff --git a/storage/eloq/mysql-test/mono_main/r/synchronization.result b/storage/eloq/mysql-test/eloq_main/r/synchronization.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/synchronization.result rename to storage/eloq/mysql-test/eloq_main/r/synchronization.result diff --git a/storage/eloq/mysql-test/mono_main/r/sysdate_is_now.result b/storage/eloq/mysql-test/eloq_main/r/sysdate_is_now.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/sysdate_is_now.result rename to storage/eloq/mysql-test/eloq_main/r/sysdate_is_now.result diff --git a/storage/eloq/mysql-test/mono_main/r/system_mysql_db.result b/storage/eloq/mysql-test/eloq_main/r/system_mysql_db.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/system_mysql_db.result rename to storage/eloq/mysql-test/eloq_main/r/system_mysql_db.result diff --git a/storage/eloq/mysql-test/mono_main/r/system_mysql_db_507.result b/storage/eloq/mysql-test/eloq_main/r/system_mysql_db_507.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/system_mysql_db_507.result rename to storage/eloq/mysql-test/eloq_main/r/system_mysql_db_507.result diff --git a/storage/eloq/mysql-test/mono_main/r/system_mysql_db_error_log.result b/storage/eloq/mysql-test/eloq_main/r/system_mysql_db_error_log.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/system_mysql_db_error_log.result rename to storage/eloq/mysql-test/eloq_main/r/system_mysql_db_error_log.result diff --git a/storage/eloq/mysql-test/mono_main/r/system_mysql_db_fix40123.result b/storage/eloq/mysql-test/eloq_main/r/system_mysql_db_fix40123.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/system_mysql_db_fix40123.result rename to storage/eloq/mysql-test/eloq_main/r/system_mysql_db_fix40123.result diff --git a/storage/eloq/mysql-test/mono_main/r/system_mysql_db_fix50030.result b/storage/eloq/mysql-test/eloq_main/r/system_mysql_db_fix50030.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/system_mysql_db_fix50030.result rename to storage/eloq/mysql-test/eloq_main/r/system_mysql_db_fix50030.result diff --git a/storage/eloq/mysql-test/mono_main/r/system_mysql_db_fix50117.result b/storage/eloq/mysql-test/eloq_main/r/system_mysql_db_fix50117.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/system_mysql_db_fix50117.result rename to storage/eloq/mysql-test/eloq_main/r/system_mysql_db_fix50117.result diff --git a/storage/eloq/mysql-test/mono_main/r/system_mysql_db_refs.result b/storage/eloq/mysql-test/eloq_main/r/system_mysql_db_refs.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/system_mysql_db_refs.result rename to storage/eloq/mysql-test/eloq_main/r/system_mysql_db_refs.result diff --git a/storage/eloq/mysql-test/mono_main/r/system_time_debug.result b/storage/eloq/mysql-test/eloq_main/r/system_time_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/system_time_debug.result rename to storage/eloq/mysql-test/eloq_main/r/system_time_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/table_elim.result b/storage/eloq/mysql-test/eloq_main/r/table_elim.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/table_elim.result rename to storage/eloq/mysql-test/eloq_main/r/table_elim.result diff --git a/storage/eloq/mysql-test/mono_main/r/table_elim_debug.result b/storage/eloq/mysql-test/eloq_main/r/table_elim_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/table_elim_debug.result rename to storage/eloq/mysql-test/eloq_main/r/table_elim_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/table_keyinfo-6838.result b/storage/eloq/mysql-test/eloq_main/r/table_keyinfo-6838.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/table_keyinfo-6838.result rename to storage/eloq/mysql-test/eloq_main/r/table_keyinfo-6838.result diff --git a/storage/eloq/mysql-test/mono_main/r/table_options-5867.result b/storage/eloq/mysql-test/eloq_main/r/table_options-5867.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/table_options-5867.result rename to storage/eloq/mysql-test/eloq_main/r/table_options-5867.result diff --git a/storage/eloq/mysql-test/mono_main/r/table_options.result b/storage/eloq/mysql-test/eloq_main/r/table_options.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/table_options.result rename to storage/eloq/mysql-test/eloq_main/r/table_options.result diff --git a/storage/eloq/mysql-test/mono_main/r/table_value_constr.result b/storage/eloq/mysql-test/eloq_main/r/table_value_constr.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/table_value_constr.result rename to storage/eloq/mysql-test/eloq_main/r/table_value_constr.result diff --git a/storage/eloq/mysql-test/mono_main/r/tablelock.result b/storage/eloq/mysql-test/eloq_main/r/tablelock.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/tablelock.result rename to storage/eloq/mysql-test/eloq_main/r/tablelock.result diff --git a/storage/eloq/mysql-test/mono_main/r/tablespace.result b/storage/eloq/mysql-test/eloq_main/r/tablespace.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/tablespace.result rename to storage/eloq/mysql-test/eloq_main/r/tablespace.result diff --git a/storage/eloq/mysql-test/mono_main/r/tc_heuristic_recover.result b/storage/eloq/mysql-test/eloq_main/r/tc_heuristic_recover.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/tc_heuristic_recover.result rename to storage/eloq/mysql-test/eloq_main/r/tc_heuristic_recover.result diff --git a/storage/eloq/mysql-test/mono_main/r/temp_table.result b/storage/eloq/mysql-test/eloq_main/r/temp_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/temp_table.result rename to storage/eloq/mysql-test/eloq_main/r/temp_table.result diff --git a/storage/eloq/mysql-test/mono_main/r/temp_table_frm.result b/storage/eloq/mysql-test/eloq_main/r/temp_table_frm.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/temp_table_frm.result rename to storage/eloq/mysql-test/eloq_main/r/temp_table_frm.result diff --git a/storage/eloq/mysql-test/mono_main/r/temp_table_symlink.result b/storage/eloq/mysql-test/eloq_main/r/temp_table_symlink.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/temp_table_symlink.result rename to storage/eloq/mysql-test/eloq_main/r/temp_table_symlink.result diff --git a/storage/eloq/mysql-test/mono_main/r/temporal_literal.result b/storage/eloq/mysql-test/eloq_main/r/temporal_literal.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/temporal_literal.result rename to storage/eloq/mysql-test/eloq_main/r/temporal_literal.result diff --git a/storage/eloq/mysql-test/mono_main/r/temporal_scale_4283.result b/storage/eloq/mysql-test/eloq_main/r/temporal_scale_4283.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/temporal_scale_4283.result rename to storage/eloq/mysql-test/eloq_main/r/temporal_scale_4283.result diff --git a/storage/eloq/mysql-test/mono_main/r/thread_id_overflow.result b/storage/eloq/mysql-test/eloq_main/r/thread_id_overflow.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/thread_id_overflow.result rename to storage/eloq/mysql-test/eloq_main/r/thread_id_overflow.result diff --git a/storage/eloq/mysql-test/mono_main/r/thread_pool_info.result b/storage/eloq/mysql-test/eloq_main/r/thread_pool_info.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/thread_pool_info.result rename to storage/eloq/mysql-test/eloq_main/r/thread_pool_info.result diff --git a/storage/eloq/mysql-test/mono_main/r/timeout.result b/storage/eloq/mysql-test/eloq_main/r/timeout.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/timeout.result rename to storage/eloq/mysql-test/eloq_main/r/timeout.result diff --git a/storage/eloq/mysql-test/mono_main/r/timezone.result b/storage/eloq/mysql-test/eloq_main/r/timezone.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/timezone.result rename to storage/eloq/mysql-test/eloq_main/r/timezone.result diff --git a/storage/eloq/mysql-test/mono_main/r/timezone2.result b/storage/eloq/mysql-test/eloq_main/r/timezone2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/timezone2.result rename to storage/eloq/mysql-test/eloq_main/r/timezone2.result diff --git a/storage/eloq/mysql-test/mono_main/r/timezone3.result b/storage/eloq/mysql-test/eloq_main/r/timezone3.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/timezone3.result rename to storage/eloq/mysql-test/eloq_main/r/timezone3.result diff --git a/storage/eloq/mysql-test/mono_main/r/timezone4.result b/storage/eloq/mysql-test/eloq_main/r/timezone4.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/timezone4.result rename to storage/eloq/mysql-test/eloq_main/r/timezone4.result diff --git a/storage/eloq/mysql-test/mono_main/r/timezone_grant.result b/storage/eloq/mysql-test/eloq_main/r/timezone_grant.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/timezone_grant.result rename to storage/eloq/mysql-test/eloq_main/r/timezone_grant.result diff --git a/storage/eloq/mysql-test/mono_main/r/tls_version.result b/storage/eloq/mysql-test/eloq_main/r/tls_version.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/tls_version.result rename to storage/eloq/mysql-test/eloq_main/r/tls_version.result diff --git a/storage/eloq/mysql-test/mono_main/r/tls_version1.result b/storage/eloq/mysql-test/eloq_main/r/tls_version1.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/tls_version1.result rename to storage/eloq/mysql-test/eloq_main/r/tls_version1.result diff --git a/storage/eloq/mysql-test/mono_main/r/tmp_table_count-7586.result b/storage/eloq/mysql-test/eloq_main/r/tmp_table_count-7586.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/tmp_table_count-7586.result rename to storage/eloq/mysql-test/eloq_main/r/tmp_table_count-7586.result diff --git a/storage/eloq/mysql-test/mono_main/r/trans_read_only.result b/storage/eloq/mysql-test/eloq_main/r/trans_read_only.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/trans_read_only.result rename to storage/eloq/mysql-test/eloq_main/r/trans_read_only.result diff --git a/storage/eloq/mysql-test/mono_main/r/transaction_timeout.result b/storage/eloq/mysql-test/eloq_main/r/transaction_timeout.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/transaction_timeout.result rename to storage/eloq/mysql-test/eloq_main/r/transaction_timeout.result diff --git a/storage/eloq/mysql-test/mono_main/r/trigger-compat.result b/storage/eloq/mysql-test/eloq_main/r/trigger-compat.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/trigger-compat.result rename to storage/eloq/mysql-test/eloq_main/r/trigger-compat.result diff --git a/storage/eloq/mysql-test/mono_main/r/trigger-trans.result b/storage/eloq/mysql-test/eloq_main/r/trigger-trans.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/trigger-trans.result rename to storage/eloq/mysql-test/eloq_main/r/trigger-trans.result diff --git a/storage/eloq/mysql-test/mono_main/r/trigger.result b/storage/eloq/mysql-test/eloq_main/r/trigger.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/trigger.result rename to storage/eloq/mysql-test/eloq_main/r/trigger.result diff --git a/storage/eloq/mysql-test/mono_main/r/trigger_no_defaults-11698.result b/storage/eloq/mysql-test/eloq_main/r/trigger_no_defaults-11698.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/trigger_no_defaults-11698.result rename to storage/eloq/mysql-test/eloq_main/r/trigger_no_defaults-11698.result diff --git a/storage/eloq/mysql-test/mono_main/r/trigger_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/trigger_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/trigger_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/trigger_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/trigger_null-8605.result b/storage/eloq/mysql-test/eloq_main/r/trigger_null-8605.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/trigger_null-8605.result rename to storage/eloq/mysql-test/eloq_main/r/trigger_null-8605.result diff --git a/storage/eloq/mysql-test/mono_main/r/trigger_wl3253.result b/storage/eloq/mysql-test/eloq_main/r/trigger_wl3253.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/trigger_wl3253.result rename to storage/eloq/mysql-test/eloq_main/r/trigger_wl3253.result diff --git a/storage/eloq/mysql-test/mono_main/r/truncate-stale-6500.result b/storage/eloq/mysql-test/eloq_main/r/truncate-stale-6500.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/truncate-stale-6500.result rename to storage/eloq/mysql-test/eloq_main/r/truncate-stale-6500.result diff --git a/storage/eloq/mysql-test/mono_main/r/truncate.result b/storage/eloq/mysql-test/eloq_main/r/truncate.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/truncate.result rename to storage/eloq/mysql-test/eloq_main/r/truncate.result diff --git a/storage/eloq/mysql-test/mono_main/r/truncate_badse.result b/storage/eloq/mysql-test/eloq_main/r/truncate_badse.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/truncate_badse.result rename to storage/eloq/mysql-test/eloq_main/r/truncate_badse.result diff --git a/storage/eloq/mysql-test/mono_main/r/truncate_coverage.result b/storage/eloq/mysql-test/eloq_main/r/truncate_coverage.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/truncate_coverage.result rename to storage/eloq/mysql-test/eloq_main/r/truncate_coverage.result diff --git a/storage/eloq/mysql-test/mono_main/r/truncate_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/truncate_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/truncate_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/truncate_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_binary.result b/storage/eloq/mysql-test/eloq_main/r/type_binary.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_binary.result rename to storage/eloq/mysql-test/eloq_main/r/type_binary.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_bit.result b/storage/eloq/mysql-test/eloq_main/r/type_bit.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_bit.result rename to storage/eloq/mysql-test/eloq_main/r/type_bit.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_bit_innodb.result b/storage/eloq/mysql-test/eloq_main/r/type_bit_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_bit_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/type_bit_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_blob.result b/storage/eloq/mysql-test/eloq_main/r/type_blob.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_blob.result rename to storage/eloq/mysql-test/eloq_main/r/type_blob.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_date.result b/storage/eloq/mysql-test/eloq_main/r/type_date.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_date.result rename to storage/eloq/mysql-test/eloq_main/r/type_date.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_date_round.result b/storage/eloq/mysql-test/eloq_main/r/type_date_round.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_date_round.result rename to storage/eloq/mysql-test/eloq_main/r/type_date_round.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_datetime.result b/storage/eloq/mysql-test/eloq_main/r/type_datetime.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_datetime.result rename to storage/eloq/mysql-test/eloq_main/r/type_datetime.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_datetime_hires.result b/storage/eloq/mysql-test/eloq_main/r/type_datetime_hires.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_datetime_hires.result rename to storage/eloq/mysql-test/eloq_main/r/type_datetime_hires.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_datetime_round.result b/storage/eloq/mysql-test/eloq_main/r/type_datetime_round.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_datetime_round.result rename to storage/eloq/mysql-test/eloq_main/r/type_datetime_round.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_decimal.result b/storage/eloq/mysql-test/eloq_main/r/type_decimal.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_decimal.result rename to storage/eloq/mysql-test/eloq_main/r/type_decimal.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_enum.result b/storage/eloq/mysql-test/eloq_main/r/type_enum.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_enum.result rename to storage/eloq/mysql-test/eloq_main/r/type_enum.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_float.result b/storage/eloq/mysql-test/eloq_main/r/type_float.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_float.result rename to storage/eloq/mysql-test/eloq_main/r/type_float.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_hex_hybrid.result b/storage/eloq/mysql-test/eloq_main/r/type_hex_hybrid.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_hex_hybrid.result rename to storage/eloq/mysql-test/eloq_main/r/type_hex_hybrid.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_int.result b/storage/eloq/mysql-test/eloq_main/r/type_int.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_int.result rename to storage/eloq/mysql-test/eloq_main/r/type_int.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_interval.result b/storage/eloq/mysql-test/eloq_main/r/type_interval.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_interval.result rename to storage/eloq/mysql-test/eloq_main/r/type_interval.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_json.result b/storage/eloq/mysql-test/eloq_main/r/type_json.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_json.result rename to storage/eloq/mysql-test/eloq_main/r/type_json.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_nchar.result b/storage/eloq/mysql-test/eloq_main/r/type_nchar.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_nchar.result rename to storage/eloq/mysql-test/eloq_main/r/type_nchar.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_newdecimal-big.result b/storage/eloq/mysql-test/eloq_main/r/type_newdecimal-big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_newdecimal-big.result rename to storage/eloq/mysql-test/eloq_main/r/type_newdecimal-big.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_newdecimal.result b/storage/eloq/mysql-test/eloq_main/r/type_newdecimal.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_newdecimal.result rename to storage/eloq/mysql-test/eloq_main/r/type_newdecimal.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_num.result b/storage/eloq/mysql-test/eloq_main/r/type_num.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_num.result rename to storage/eloq/mysql-test/eloq_main/r/type_num.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_num_innodb.result b/storage/eloq/mysql-test/eloq_main/r/type_num_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_num_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/type_num_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_ranges.result b/storage/eloq/mysql-test/eloq_main/r/type_ranges.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_ranges.result rename to storage/eloq/mysql-test/eloq_main/r/type_ranges.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_row.result b/storage/eloq/mysql-test/eloq_main/r/type_row.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_row.result rename to storage/eloq/mysql-test/eloq_main/r/type_row.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_set.result b/storage/eloq/mysql-test/eloq_main/r/type_set.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_set.result rename to storage/eloq/mysql-test/eloq_main/r/type_set.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_temporal_innodb.result b/storage/eloq/mysql-test/eloq_main/r/type_temporal_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_temporal_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/type_temporal_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_temporal_mariadb53.result b/storage/eloq/mysql-test/eloq_main/r/type_temporal_mariadb53.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_temporal_mariadb53.result rename to storage/eloq/mysql-test/eloq_main/r/type_temporal_mariadb53.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_temporal_mysql56.result b/storage/eloq/mysql-test/eloq_main/r/type_temporal_mysql56.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_temporal_mysql56.result rename to storage/eloq/mysql-test/eloq_main/r/type_temporal_mysql56.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_temporal_mysql56_debug.result b/storage/eloq/mysql-test/eloq_main/r/type_temporal_mysql56_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_temporal_mysql56_debug.result rename to storage/eloq/mysql-test/eloq_main/r/type_temporal_mysql56_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_time.result b/storage/eloq/mysql-test/eloq_main/r/type_time.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_time.result rename to storage/eloq/mysql-test/eloq_main/r/type_time.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_time_6065.result b/storage/eloq/mysql-test/eloq_main/r/type_time_6065.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_time_6065.result rename to storage/eloq/mysql-test/eloq_main/r/type_time_6065.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_time_hires.result b/storage/eloq/mysql-test/eloq_main/r/type_time_hires.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_time_hires.result rename to storage/eloq/mysql-test/eloq_main/r/type_time_hires.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_time_round.result b/storage/eloq/mysql-test/eloq_main/r/type_time_round.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_time_round.result rename to storage/eloq/mysql-test/eloq_main/r/type_time_round.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_timestamp.result b/storage/eloq/mysql-test/eloq_main/r/type_timestamp.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_timestamp.result rename to storage/eloq/mysql-test/eloq_main/r/type_timestamp.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_timestamp_hires.result b/storage/eloq/mysql-test/eloq_main/r/type_timestamp_hires.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_timestamp_hires.result rename to storage/eloq/mysql-test/eloq_main/r/type_timestamp_hires.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_timestamp_round.result b/storage/eloq/mysql-test/eloq_main/r/type_timestamp_round.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_timestamp_round.result rename to storage/eloq/mysql-test/eloq_main/r/type_timestamp_round.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_uint.result b/storage/eloq/mysql-test/eloq_main/r/type_uint.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_uint.result rename to storage/eloq/mysql-test/eloq_main/r/type_uint.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_varchar.result b/storage/eloq/mysql-test/eloq_main/r/type_varchar.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_varchar.result rename to storage/eloq/mysql-test/eloq_main/r/type_varchar.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_varchar_mysql41.result b/storage/eloq/mysql-test/eloq_main/r/type_varchar_mysql41.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_varchar_mysql41.result rename to storage/eloq/mysql-test/eloq_main/r/type_varchar_mysql41.result diff --git a/storage/eloq/mysql-test/mono_main/r/type_year.result b/storage/eloq/mysql-test/eloq_main/r/type_year.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/type_year.result rename to storage/eloq/mysql-test/eloq_main/r/type_year.result diff --git a/storage/eloq/mysql-test/mono_main/r/udf.result b/storage/eloq/mysql-test/eloq_main/r/udf.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/udf.result rename to storage/eloq/mysql-test/eloq_main/r/udf.result diff --git a/storage/eloq/mysql-test/mono_main/r/udf_debug_sync.result b/storage/eloq/mysql-test/eloq_main/r/udf_debug_sync.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/udf_debug_sync.result rename to storage/eloq/mysql-test/eloq_main/r/udf_debug_sync.result diff --git a/storage/eloq/mysql-test/mono_main/r/udf_notembedded.result b/storage/eloq/mysql-test/eloq_main/r/udf_notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/udf_notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/udf_notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/udf_query_cache.result b/storage/eloq/mysql-test/eloq_main/r/udf_query_cache.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/udf_query_cache.result rename to storage/eloq/mysql-test/eloq_main/r/udf_query_cache.result diff --git a/storage/eloq/mysql-test/mono_main/r/udf_skip_grants.result b/storage/eloq/mysql-test/eloq_main/r/udf_skip_grants.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/udf_skip_grants.result rename to storage/eloq/mysql-test/eloq_main/r/udf_skip_grants.result diff --git a/storage/eloq/mysql-test/mono_main/r/union.result b/storage/eloq/mysql-test/eloq_main/r/union.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/union.result rename to storage/eloq/mysql-test/eloq_main/r/union.result diff --git a/storage/eloq/mysql-test/mono_main/r/union_crash-714.result b/storage/eloq/mysql-test/eloq_main/r/union_crash-714.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/union_crash-714.result rename to storage/eloq/mysql-test/eloq_main/r/union_crash-714.result diff --git a/storage/eloq/mysql-test/mono_main/r/unique.result b/storage/eloq/mysql-test/eloq_main/r/unique.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/unique.result rename to storage/eloq/mysql-test/eloq_main/r/unique.result diff --git a/storage/eloq/mysql-test/mono_main/r/unsafe_binlog_innodb.result b/storage/eloq/mysql-test/eloq_main/r/unsafe_binlog_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/unsafe_binlog_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/unsafe_binlog_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/update.result b/storage/eloq/mysql-test/eloq_main/r/update.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/update.result rename to storage/eloq/mysql-test/eloq_main/r/update.result diff --git a/storage/eloq/mysql-test/mono_main/r/update_ignore_216.result b/storage/eloq/mysql-test/eloq_main/r/update_ignore_216.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/update_ignore_216.result rename to storage/eloq/mysql-test/eloq_main/r/update_ignore_216.result diff --git a/storage/eloq/mysql-test/mono_main/r/update_innodb.result b/storage/eloq/mysql-test/eloq_main/r/update_innodb.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/update_innodb.result rename to storage/eloq/mysql-test/eloq_main/r/update_innodb.result diff --git a/storage/eloq/mysql-test/mono_main/r/update_use_source.result b/storage/eloq/mysql-test/eloq_main/r/update_use_source.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/update_use_source.result rename to storage/eloq/mysql-test/eloq_main/r/update_use_source.result diff --git a/storage/eloq/mysql-test/mono_main/r/upgrade.result b/storage/eloq/mysql-test/eloq_main/r/upgrade.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/upgrade.result rename to storage/eloq/mysql-test/eloq_main/r/upgrade.result diff --git a/storage/eloq/mysql-test/mono_main/r/upgrade_MDEV-19650.result b/storage/eloq/mysql-test/eloq_main/r/upgrade_MDEV-19650.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/upgrade_MDEV-19650.result rename to storage/eloq/mysql-test/eloq_main/r/upgrade_MDEV-19650.result diff --git a/storage/eloq/mysql-test/mono_main/r/upgrade_MDEV-23102-1.result b/storage/eloq/mysql-test/eloq_main/r/upgrade_MDEV-23102-1.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/upgrade_MDEV-23102-1.result rename to storage/eloq/mysql-test/eloq_main/r/upgrade_MDEV-23102-1.result diff --git a/storage/eloq/mysql-test/mono_main/r/upgrade_MDEV-23102-2.result b/storage/eloq/mysql-test/eloq_main/r/upgrade_MDEV-23102-2.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/upgrade_MDEV-23102-2.result rename to storage/eloq/mysql-test/eloq_main/r/upgrade_MDEV-23102-2.result diff --git a/storage/eloq/mysql-test/mono_main/r/upgrade_mdev_24363.result b/storage/eloq/mysql-test/eloq_main/r/upgrade_mdev_24363.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/upgrade_mdev_24363.result rename to storage/eloq/mysql-test/eloq_main/r/upgrade_mdev_24363.result diff --git a/storage/eloq/mysql-test/mono_main/r/user_limits.result b/storage/eloq/mysql-test/eloq_main/r/user_limits.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/user_limits.result rename to storage/eloq/mysql-test/eloq_main/r/user_limits.result diff --git a/storage/eloq/mysql-test/mono_main/r/user_var-binlog.result b/storage/eloq/mysql-test/eloq_main/r/user_var-binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/user_var-binlog.result rename to storage/eloq/mysql-test/eloq_main/r/user_var-binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/user_var.result b/storage/eloq/mysql-test/eloq_main/r/user_var.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/user_var.result rename to storage/eloq/mysql-test/eloq_main/r/user_var.result diff --git a/storage/eloq/mysql-test/mono_main/r/userstat-badlogin-4824.result b/storage/eloq/mysql-test/eloq_main/r/userstat-badlogin-4824.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/userstat-badlogin-4824.result rename to storage/eloq/mysql-test/eloq_main/r/userstat-badlogin-4824.result diff --git a/storage/eloq/mysql-test/mono_main/r/userstat.result b/storage/eloq/mysql-test/eloq_main/r/userstat.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/userstat.result rename to storage/eloq/mysql-test/eloq_main/r/userstat.result diff --git a/storage/eloq/mysql-test/mono_main/r/varbinary.result b/storage/eloq/mysql-test/eloq_main/r/varbinary.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/varbinary.result rename to storage/eloq/mysql-test/eloq_main/r/varbinary.result diff --git a/storage/eloq/mysql-test/mono_main/r/variables-notembedded.result b/storage/eloq/mysql-test/eloq_main/r/variables-notembedded.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/variables-notembedded.result rename to storage/eloq/mysql-test/eloq_main/r/variables-notembedded.result diff --git a/storage/eloq/mysql-test/mono_main/r/variables.result b/storage/eloq/mysql-test/eloq_main/r/variables.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/variables.result rename to storage/eloq/mysql-test/eloq_main/r/variables.result diff --git a/storage/eloq/mysql-test/mono_main/r/variables_community.result b/storage/eloq/mysql-test/eloq_main/r/variables_community.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/variables_community.result rename to storage/eloq/mysql-test/eloq_main/r/variables_community.result diff --git a/storage/eloq/mysql-test/mono_main/r/view.result b/storage/eloq/mysql-test/eloq_main/r/view.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/view.result rename to storage/eloq/mysql-test/eloq_main/r/view.result diff --git a/storage/eloq/mysql-test/mono_main/r/view_alias.result b/storage/eloq/mysql-test/eloq_main/r/view_alias.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/view_alias.result rename to storage/eloq/mysql-test/eloq_main/r/view_alias.result diff --git a/storage/eloq/mysql-test/mono_main/r/view_debug.result b/storage/eloq/mysql-test/eloq_main/r/view_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/view_debug.result rename to storage/eloq/mysql-test/eloq_main/r/view_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/view_grant.result b/storage/eloq/mysql-test/eloq_main/r/view_grant.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/view_grant.result rename to storage/eloq/mysql-test/eloq_main/r/view_grant.result diff --git a/storage/eloq/mysql-test/mono_main/r/wait_timeout.result b/storage/eloq/mysql-test/eloq_main/r/wait_timeout.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/wait_timeout.result rename to storage/eloq/mysql-test/eloq_main/r/wait_timeout.result diff --git a/storage/eloq/mysql-test/mono_main/r/warnings.result b/storage/eloq/mysql-test/eloq_main/r/warnings.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/warnings.result rename to storage/eloq/mysql-test/eloq_main/r/warnings.result diff --git a/storage/eloq/mysql-test/mono_main/r/warnings_debug.result b/storage/eloq/mysql-test/eloq_main/r/warnings_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/warnings_debug.result rename to storage/eloq/mysql-test/eloq_main/r/warnings_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/warnings_engine_disabled.result b/storage/eloq/mysql-test/eloq_main/r/warnings_engine_disabled.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/warnings_engine_disabled.result rename to storage/eloq/mysql-test/eloq_main/r/warnings_engine_disabled.result diff --git a/storage/eloq/mysql-test/mono_main/r/win.result b/storage/eloq/mysql-test/eloq_main/r/win.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win.result rename to storage/eloq/mysql-test/eloq_main/r/win.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_as_arg_to_aggregate_func.result b/storage/eloq/mysql-test/eloq_main/r/win_as_arg_to_aggregate_func.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_as_arg_to_aggregate_func.result rename to storage/eloq/mysql-test/eloq_main/r/win_as_arg_to_aggregate_func.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_avg.result b/storage/eloq/mysql-test/eloq_main/r/win_avg.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_avg.result rename to storage/eloq/mysql-test/eloq_main/r/win_avg.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_big-mdev-10092.result b/storage/eloq/mysql-test/eloq_main/r/win_big-mdev-10092.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_big-mdev-10092.result rename to storage/eloq/mysql-test/eloq_main/r/win_big-mdev-10092.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_big-mdev-11697.result b/storage/eloq/mysql-test/eloq_main/r/win_big-mdev-11697.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_big-mdev-11697.result rename to storage/eloq/mysql-test/eloq_main/r/win_big-mdev-11697.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_big.result b/storage/eloq/mysql-test/eloq_main/r/win_big.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_big.result rename to storage/eloq/mysql-test/eloq_main/r/win_big.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_bit.result b/storage/eloq/mysql-test/eloq_main/r/win_bit.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_bit.result rename to storage/eloq/mysql-test/eloq_main/r/win_bit.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_empty_over.result b/storage/eloq/mysql-test/eloq_main/r/win_empty_over.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_empty_over.result rename to storage/eloq/mysql-test/eloq_main/r/win_empty_over.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_first_last_value.result b/storage/eloq/mysql-test/eloq_main/r/win_first_last_value.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_first_last_value.result rename to storage/eloq/mysql-test/eloq_main/r/win_first_last_value.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_i_s.result b/storage/eloq/mysql-test/eloq_main/r/win_i_s.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_i_s.result rename to storage/eloq/mysql-test/eloq_main/r/win_i_s.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_insert_select.result b/storage/eloq/mysql-test/eloq_main/r/win_insert_select.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_insert_select.result rename to storage/eloq/mysql-test/eloq_main/r/win_insert_select.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_lead_lag.result b/storage/eloq/mysql-test/eloq_main/r/win_lead_lag.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_lead_lag.result rename to storage/eloq/mysql-test/eloq_main/r/win_lead_lag.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_min_max.result b/storage/eloq/mysql-test/eloq_main/r/win_min_max.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_min_max.result rename to storage/eloq/mysql-test/eloq_main/r/win_min_max.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_nth_value.result b/storage/eloq/mysql-test/eloq_main/r/win_nth_value.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_nth_value.result rename to storage/eloq/mysql-test/eloq_main/r/win_nth_value.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_ntile.result b/storage/eloq/mysql-test/eloq_main/r/win_ntile.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_ntile.result rename to storage/eloq/mysql-test/eloq_main/r/win_ntile.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_orderby.result b/storage/eloq/mysql-test/eloq_main/r/win_orderby.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_orderby.result rename to storage/eloq/mysql-test/eloq_main/r/win_orderby.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_percent_cume.result b/storage/eloq/mysql-test/eloq_main/r/win_percent_cume.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_percent_cume.result rename to storage/eloq/mysql-test/eloq_main/r/win_percent_cume.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_percentile.result b/storage/eloq/mysql-test/eloq_main/r/win_percentile.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_percentile.result rename to storage/eloq/mysql-test/eloq_main/r/win_percentile.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_rank.result b/storage/eloq/mysql-test/eloq_main/r/win_rank.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_rank.result rename to storage/eloq/mysql-test/eloq_main/r/win_rank.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_std.result b/storage/eloq/mysql-test/eloq_main/r/win_std.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_std.result rename to storage/eloq/mysql-test/eloq_main/r/win_std.result diff --git a/storage/eloq/mysql-test/mono_main/r/win_sum.result b/storage/eloq/mysql-test/eloq_main/r/win_sum.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/win_sum.result rename to storage/eloq/mysql-test/eloq_main/r/win_sum.result diff --git a/storage/eloq/mysql-test/mono_main/r/windows.result b/storage/eloq/mysql-test/eloq_main/r/windows.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/windows.result rename to storage/eloq/mysql-test/eloq_main/r/windows.result diff --git a/storage/eloq/mysql-test/mono_main/r/windows_debug.result b/storage/eloq/mysql-test/eloq_main/r/windows_debug.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/windows_debug.result rename to storage/eloq/mysql-test/eloq_main/r/windows_debug.result diff --git a/storage/eloq/mysql-test/mono_main/r/wolfssl.result b/storage/eloq/mysql-test/eloq_main/r/wolfssl.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/wolfssl.result rename to storage/eloq/mysql-test/eloq_main/r/wolfssl.result diff --git a/storage/eloq/mysql-test/mono_main/r/xa.result b/storage/eloq/mysql-test/eloq_main/r/xa.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/xa.result rename to storage/eloq/mysql-test/eloq_main/r/xa.result diff --git a/storage/eloq/mysql-test/mono_main/r/xa_binlog.result b/storage/eloq/mysql-test/eloq_main/r/xa_binlog.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/xa_binlog.result rename to storage/eloq/mysql-test/eloq_main/r/xa_binlog.result diff --git a/storage/eloq/mysql-test/mono_main/r/xa_prepared_binlog_off.result b/storage/eloq/mysql-test/eloq_main/r/xa_prepared_binlog_off.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/xa_prepared_binlog_off.result rename to storage/eloq/mysql-test/eloq_main/r/xa_prepared_binlog_off.result diff --git a/storage/eloq/mysql-test/mono_main/r/xa_sync.result b/storage/eloq/mysql-test/eloq_main/r/xa_sync.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/xa_sync.result rename to storage/eloq/mysql-test/eloq_main/r/xa_sync.result diff --git a/storage/eloq/mysql-test/mono_main/r/xml.result b/storage/eloq/mysql-test/eloq_main/r/xml.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/xml.result rename to storage/eloq/mysql-test/eloq_main/r/xml.result diff --git a/storage/eloq/mysql-test/mono_main/r/xtradb_mrr.result b/storage/eloq/mysql-test/eloq_main/r/xtradb_mrr.result similarity index 100% rename from storage/eloq/mysql-test/mono_main/r/xtradb_mrr.result rename to storage/eloq/mysql-test/eloq_main/r/xtradb_mrr.result diff --git a/storage/eloq/mysql-test/mono_main/t/1st.test b/storage/eloq/mysql-test/eloq_main/t/1st.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/1st.test rename to storage/eloq/mysql-test/eloq_main/t/1st.test diff --git a/storage/eloq/mysql-test/mono_main/t/aborted_clients.test b/storage/eloq/mysql-test/eloq_main/t/aborted_clients.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/aborted_clients.test rename to storage/eloq/mysql-test/eloq_main/t/aborted_clients.test diff --git a/storage/eloq/mysql-test/mono_main/t/adddate_454.test b/storage/eloq/mysql-test/eloq_main/t/adddate_454.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/adddate_454.test rename to storage/eloq/mysql-test/eloq_main/t/adddate_454.test diff --git a/storage/eloq/mysql-test/mono_main/t/alias.test b/storage/eloq/mysql-test/eloq_main/t/alias.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alias.test rename to storage/eloq/mysql-test/eloq_main/t/alias.test diff --git a/storage/eloq/mysql-test/mono_main/t/almost_full.test b/storage/eloq/mysql-test/eloq_main/t/almost_full.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/almost_full.test rename to storage/eloq/mysql-test/eloq_main/t/almost_full.test diff --git a/storage/eloq/mysql-test/mono_main/t/alter_events.test b/storage/eloq/mysql-test/eloq_main/t/alter_events.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_events.test rename to storage/eloq/mysql-test/eloq_main/t/alter_events.test diff --git a/storage/eloq/mysql-test/mono_main/t/alter_table-big.test b/storage/eloq/mysql-test/eloq_main/t/alter_table-big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_table-big.test rename to storage/eloq/mysql-test/eloq_main/t/alter_table-big.test diff --git a/storage/eloq/mysql-test/mono_main/t/alter_table.combinations b/storage/eloq/mysql-test/eloq_main/t/alter_table.combinations similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_table.combinations rename to storage/eloq/mysql-test/eloq_main/t/alter_table.combinations diff --git a/storage/eloq/mysql-test/mono_main/t/alter_table.test b/storage/eloq/mysql-test/eloq_main/t/alter_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_table.test rename to storage/eloq/mysql-test/eloq_main/t/alter_table.test diff --git a/storage/eloq/mysql-test/mono_main/t/alter_table_autoinc-5574.test b/storage/eloq/mysql-test/eloq_main/t/alter_table_autoinc-5574.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_table_autoinc-5574.test rename to storage/eloq/mysql-test/eloq_main/t/alter_table_autoinc-5574.test diff --git a/storage/eloq/mysql-test/mono_main/t/alter_table_debug.test b/storage/eloq/mysql-test/eloq_main/t/alter_table_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_table_debug.test rename to storage/eloq/mysql-test/eloq_main/t/alter_table_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/alter_table_errors.test b/storage/eloq/mysql-test/eloq_main/t/alter_table_errors.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_table_errors.test rename to storage/eloq/mysql-test/eloq_main/t/alter_table_errors.test diff --git a/storage/eloq/mysql-test/mono_main/t/alter_table_mdev539_maria.test b/storage/eloq/mysql-test/eloq_main/t/alter_table_mdev539_maria.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_table_mdev539_maria.test rename to storage/eloq/mysql-test/eloq_main/t/alter_table_mdev539_maria.test diff --git a/storage/eloq/mysql-test/mono_main/t/alter_table_mdev539_myisam.test b/storage/eloq/mysql-test/eloq_main/t/alter_table_mdev539_myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_table_mdev539_myisam.test rename to storage/eloq/mysql-test/eloq_main/t/alter_table_mdev539_myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/alter_table_online.test b/storage/eloq/mysql-test/eloq_main/t/alter_table_online.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_table_online.test rename to storage/eloq/mysql-test/eloq_main/t/alter_table_online.test diff --git a/storage/eloq/mysql-test/mono_main/t/alter_table_trans.test b/storage/eloq/mysql-test/eloq_main/t/alter_table_trans.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_table_trans.test rename to storage/eloq/mysql-test/eloq_main/t/alter_table_trans.test diff --git a/storage/eloq/mysql-test/mono_main/t/alter_user.test b/storage/eloq/mysql-test/eloq_main/t/alter_user.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/alter_user.test rename to storage/eloq/mysql-test/eloq_main/t/alter_user.test diff --git a/storage/eloq/mysql-test/mono_main/t/analyze.test b/storage/eloq/mysql-test/eloq_main/t/analyze.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/analyze.test rename to storage/eloq/mysql-test/eloq_main/t/analyze.test diff --git a/storage/eloq/mysql-test/mono_main/t/analyze_debug.test b/storage/eloq/mysql-test/eloq_main/t/analyze_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/analyze_debug.test rename to storage/eloq/mysql-test/eloq_main/t/analyze_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/analyze_format_json.test b/storage/eloq/mysql-test/eloq_main/t/analyze_format_json.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/analyze_format_json.test rename to storage/eloq/mysql-test/eloq_main/t/analyze_format_json.test diff --git a/storage/eloq/mysql-test/mono_main/t/analyze_stmt.test b/storage/eloq/mysql-test/eloq_main/t/analyze_stmt.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/analyze_stmt.test rename to storage/eloq/mysql-test/eloq_main/t/analyze_stmt.test diff --git a/storage/eloq/mysql-test/mono_main/t/analyze_stmt_orderby.test b/storage/eloq/mysql-test/eloq_main/t/analyze_stmt_orderby.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/analyze_stmt_orderby.test rename to storage/eloq/mysql-test/eloq_main/t/analyze_stmt_orderby.test diff --git a/storage/eloq/mysql-test/mono_main/t/analyze_stmt_privileges.test b/storage/eloq/mysql-test/eloq_main/t/analyze_stmt_privileges.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/analyze_stmt_privileges.test rename to storage/eloq/mysql-test/eloq_main/t/analyze_stmt_privileges.test diff --git a/storage/eloq/mysql-test/mono_main/t/analyze_stmt_privileges2.test b/storage/eloq/mysql-test/eloq_main/t/analyze_stmt_privileges2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/analyze_stmt_privileges2.test rename to storage/eloq/mysql-test/eloq_main/t/analyze_stmt_privileges2.test diff --git a/storage/eloq/mysql-test/mono_main/t/analyze_stmt_slow_query_log-master.opt b/storage/eloq/mysql-test/eloq_main/t/analyze_stmt_slow_query_log-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/analyze_stmt_slow_query_log-master.opt rename to storage/eloq/mysql-test/eloq_main/t/analyze_stmt_slow_query_log-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/analyze_stmt_slow_query_log.test b/storage/eloq/mysql-test/eloq_main/t/analyze_stmt_slow_query_log.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/analyze_stmt_slow_query_log.test rename to storage/eloq/mysql-test/eloq_main/t/analyze_stmt_slow_query_log.test diff --git a/storage/eloq/mysql-test/mono_main/t/ansi.test b/storage/eloq/mysql-test/eloq_main/t/ansi.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ansi.test rename to storage/eloq/mysql-test/eloq_main/t/ansi.test diff --git a/storage/eloq/mysql-test/mono_main/t/aria_icp_debug.test b/storage/eloq/mysql-test/eloq_main/t/aria_icp_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/aria_icp_debug.test rename to storage/eloq/mysql-test/eloq_main/t/aria_icp_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/assign_key_cache.test b/storage/eloq/mysql-test/eloq_main/t/assign_key_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/assign_key_cache.test rename to storage/eloq/mysql-test/eloq_main/t/assign_key_cache.test diff --git a/storage/eloq/mysql-test/mono_main/t/assign_key_cache_debug.test b/storage/eloq/mysql-test/eloq_main/t/assign_key_cache_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/assign_key_cache_debug.test rename to storage/eloq/mysql-test/eloq_main/t/assign_key_cache_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/auth_named_pipe-master.opt b/storage/eloq/mysql-test/eloq_main/t/auth_named_pipe-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/auth_named_pipe-master.opt rename to storage/eloq/mysql-test/eloq_main/t/auth_named_pipe-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/auth_named_pipe.test b/storage/eloq/mysql-test/eloq_main/t/auth_named_pipe.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/auth_named_pipe.test rename to storage/eloq/mysql-test/eloq_main/t/auth_named_pipe.test diff --git a/storage/eloq/mysql-test/mono_main/t/auth_rpl-slave.opt b/storage/eloq/mysql-test/eloq_main/t/auth_rpl-slave.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/auth_rpl-slave.opt rename to storage/eloq/mysql-test/eloq_main/t/auth_rpl-slave.opt diff --git a/storage/eloq/mysql-test/mono_main/t/auth_rpl.test b/storage/eloq/mysql-test/eloq_main/t/auth_rpl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/auth_rpl.test rename to storage/eloq/mysql-test/eloq_main/t/auth_rpl.test diff --git a/storage/eloq/mysql-test/mono_main/t/auto_increment.test b/storage/eloq/mysql-test/eloq_main/t/auto_increment.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/auto_increment.test rename to storage/eloq/mysql-test/eloq_main/t/auto_increment.test diff --git a/storage/eloq/mysql-test/mono_main/t/auto_increment_ranges.inc b/storage/eloq/mysql-test/eloq_main/t/auto_increment_ranges.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/auto_increment_ranges.inc rename to storage/eloq/mysql-test/eloq_main/t/auto_increment_ranges.inc diff --git a/storage/eloq/mysql-test/mono_main/t/auto_increment_ranges_innodb.test b/storage/eloq/mysql-test/eloq_main/t/auto_increment_ranges_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/auto_increment_ranges_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/auto_increment_ranges_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/auto_increment_ranges_myisam.test b/storage/eloq/mysql-test/eloq_main/t/auto_increment_ranges_myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/auto_increment_ranges_myisam.test rename to storage/eloq/mysql-test/eloq_main/t/auto_increment_ranges_myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/backup_aria.test b/storage/eloq/mysql-test/eloq_main/t/backup_aria.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/backup_aria.test rename to storage/eloq/mysql-test/eloq_main/t/backup_aria.test diff --git a/storage/eloq/mysql-test/mono_main/t/backup_interaction.test b/storage/eloq/mysql-test/eloq_main/t/backup_interaction.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/backup_interaction.test rename to storage/eloq/mysql-test/eloq_main/t/backup_interaction.test diff --git a/storage/eloq/mysql-test/mono_main/t/backup_lock.test b/storage/eloq/mysql-test/eloq_main/t/backup_lock.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/backup_lock.test rename to storage/eloq/mysql-test/eloq_main/t/backup_lock.test diff --git a/storage/eloq/mysql-test/mono_main/t/backup_lock_binlog.test b/storage/eloq/mysql-test/eloq_main/t/backup_lock_binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/backup_lock_binlog.test rename to storage/eloq/mysql-test/eloq_main/t/backup_lock_binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/backup_lock_debug.test b/storage/eloq/mysql-test/eloq_main/t/backup_lock_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/backup_lock_debug.test rename to storage/eloq/mysql-test/eloq_main/t/backup_lock_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/backup_locks.test b/storage/eloq/mysql-test/eloq_main/t/backup_locks.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/backup_locks.test rename to storage/eloq/mysql-test/eloq_main/t/backup_locks.test diff --git a/storage/eloq/mysql-test/mono_main/t/backup_log.inc b/storage/eloq/mysql-test/eloq_main/t/backup_log.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/backup_log.inc rename to storage/eloq/mysql-test/eloq_main/t/backup_log.inc diff --git a/storage/eloq/mysql-test/mono_main/t/backup_log.test b/storage/eloq/mysql-test/eloq_main/t/backup_log.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/backup_log.test rename to storage/eloq/mysql-test/eloq_main/t/backup_log.test diff --git a/storage/eloq/mysql-test/mono_main/t/backup_priv.test b/storage/eloq/mysql-test/eloq_main/t/backup_priv.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/backup_priv.test rename to storage/eloq/mysql-test/eloq_main/t/backup_priv.test diff --git a/storage/eloq/mysql-test/mono_main/t/backup_stages.test b/storage/eloq/mysql-test/eloq_main/t/backup_stages.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/backup_stages.test rename to storage/eloq/mysql-test/eloq_main/t/backup_stages.test diff --git a/storage/eloq/mysql-test/mono_main/t/backup_syntax.test b/storage/eloq/mysql-test/eloq_main/t/backup_syntax.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/backup_syntax.test rename to storage/eloq/mysql-test/eloq_main/t/backup_syntax.test diff --git a/storage/eloq/mysql-test/mono_main/t/bad_frm_crash_5029.test b/storage/eloq/mysql-test/eloq_main/t/bad_frm_crash_5029.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bad_frm_crash_5029.test rename to storage/eloq/mysql-test/eloq_main/t/bad_frm_crash_5029.test diff --git a/storage/eloq/mysql-test/mono_main/t/bench_count_distinct.test b/storage/eloq/mysql-test/eloq_main/t/bench_count_distinct.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bench_count_distinct.test rename to storage/eloq/mysql-test/eloq_main/t/bench_count_distinct.test diff --git a/storage/eloq/mysql-test/mono_main/t/bigint.test b/storage/eloq/mysql-test/eloq_main/t/bigint.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bigint.test rename to storage/eloq/mysql-test/eloq_main/t/bigint.test diff --git a/storage/eloq/mysql-test/mono_main/t/binary.test b/storage/eloq/mysql-test/eloq_main/t/binary.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/binary.test rename to storage/eloq/mysql-test/eloq_main/t/binary.test diff --git a/storage/eloq/mysql-test/mono_main/t/binary_to_hex.test b/storage/eloq/mysql-test/eloq_main/t/binary_to_hex.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/binary_to_hex.test rename to storage/eloq/mysql-test/eloq_main/t/binary_to_hex.test diff --git a/storage/eloq/mysql-test/mono_main/t/bind_address_resolution.opt b/storage/eloq/mysql-test/eloq_main/t/bind_address_resolution.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bind_address_resolution.opt rename to storage/eloq/mysql-test/eloq_main/t/bind_address_resolution.opt diff --git a/storage/eloq/mysql-test/mono_main/t/bind_address_resolution.test b/storage/eloq/mysql-test/eloq_main/t/bind_address_resolution.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bind_address_resolution.test rename to storage/eloq/mysql-test/eloq_main/t/bind_address_resolution.test diff --git a/storage/eloq/mysql-test/mono_main/t/blackhole.test b/storage/eloq/mysql-test/eloq_main/t/blackhole.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/blackhole.test rename to storage/eloq/mysql-test/eloq_main/t/blackhole.test diff --git a/storage/eloq/mysql-test/mono_main/t/blackhole_plugin.test b/storage/eloq/mysql-test/eloq_main/t/blackhole_plugin.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/blackhole_plugin.test rename to storage/eloq/mysql-test/eloq_main/t/blackhole_plugin.test diff --git a/storage/eloq/mysql-test/mono_main/t/bool.test b/storage/eloq/mysql-test/eloq_main/t/bool.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bool.test rename to storage/eloq/mysql-test/eloq_main/t/bool.test diff --git a/storage/eloq/mysql-test/mono_main/t/bootstrap-master.opt b/storage/eloq/mysql-test/eloq_main/t/bootstrap-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bootstrap-master.opt rename to storage/eloq/mysql-test/eloq_main/t/bootstrap-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/bootstrap.test b/storage/eloq/mysql-test/eloq_main/t/bootstrap.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bootstrap.test rename to storage/eloq/mysql-test/eloq_main/t/bootstrap.test diff --git a/storage/eloq/mysql-test/mono_main/t/bootstrap_innodb.test b/storage/eloq/mysql-test/eloq_main/t/bootstrap_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bootstrap_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/bootstrap_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/brackets.test b/storage/eloq/mysql-test/eloq_main/t/brackets.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/brackets.test rename to storage/eloq/mysql-test/eloq_main/t/brackets.test diff --git a/storage/eloq/mysql-test/mono_main/t/bug12427262.test b/storage/eloq/mysql-test/eloq_main/t/bug12427262.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bug12427262.test rename to storage/eloq/mysql-test/eloq_main/t/bug12427262.test diff --git a/storage/eloq/mysql-test/mono_main/t/bug13633383.test b/storage/eloq/mysql-test/eloq_main/t/bug13633383.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bug13633383.test rename to storage/eloq/mysql-test/eloq_main/t/bug13633383.test diff --git a/storage/eloq/mysql-test/mono_main/t/bug39022.opt b/storage/eloq/mysql-test/eloq_main/t/bug39022.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bug39022.opt rename to storage/eloq/mysql-test/eloq_main/t/bug39022.opt diff --git a/storage/eloq/mysql-test/mono_main/t/bug39022.test b/storage/eloq/mysql-test/eloq_main/t/bug39022.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bug39022.test rename to storage/eloq/mysql-test/eloq_main/t/bug39022.test diff --git a/storage/eloq/mysql-test/mono_main/t/bug46760-master.opt b/storage/eloq/mysql-test/eloq_main/t/bug46760-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bug46760-master.opt rename to storage/eloq/mysql-test/eloq_main/t/bug46760-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/bug46760.test b/storage/eloq/mysql-test/eloq_main/t/bug46760.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bug46760.test rename to storage/eloq/mysql-test/eloq_main/t/bug46760.test diff --git a/storage/eloq/mysql-test/mono_main/t/bug47671-master.opt b/storage/eloq/mysql-test/eloq_main/t/bug47671-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bug47671-master.opt rename to storage/eloq/mysql-test/eloq_main/t/bug47671-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/bug47671.test b/storage/eloq/mysql-test/eloq_main/t/bug47671.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bug47671.test rename to storage/eloq/mysql-test/eloq_main/t/bug47671.test diff --git a/storage/eloq/mysql-test/mono_main/t/bug58669-master.opt b/storage/eloq/mysql-test/eloq_main/t/bug58669-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bug58669-master.opt rename to storage/eloq/mysql-test/eloq_main/t/bug58669-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/bug58669.test b/storage/eloq/mysql-test/eloq_main/t/bug58669.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bug58669.test rename to storage/eloq/mysql-test/eloq_main/t/bug58669.test diff --git a/storage/eloq/mysql-test/mono_main/t/bulk_replace.test b/storage/eloq/mysql-test/eloq_main/t/bulk_replace.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/bulk_replace.test rename to storage/eloq/mysql-test/eloq_main/t/bulk_replace.test diff --git a/storage/eloq/mysql-test/mono_main/t/cache_innodb.test b/storage/eloq/mysql-test/eloq_main/t/cache_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cache_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/cache_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/cache_temporal_4265.test b/storage/eloq/mysql-test/eloq_main/t/cache_temporal_4265.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cache_temporal_4265.test rename to storage/eloq/mysql-test/eloq_main/t/cache_temporal_4265.test diff --git a/storage/eloq/mysql-test/mono_main/t/case.test b/storage/eloq/mysql-test/eloq_main/t/case.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/case.test rename to storage/eloq/mysql-test/eloq_main/t/case.test diff --git a/storage/eloq/mysql-test/mono_main/t/cast.test b/storage/eloq/mysql-test/eloq_main/t/cast.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cast.test rename to storage/eloq/mysql-test/eloq_main/t/cast.test diff --git a/storage/eloq/mysql-test/mono_main/t/change_user.test b/storage/eloq/mysql-test/eloq_main/t/change_user.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/change_user.test rename to storage/eloq/mysql-test/eloq_main/t/change_user.test diff --git a/storage/eloq/mysql-test/mono_main/t/change_user_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/change_user_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/change_user_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/change_user_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/charset_client_win.test b/storage/eloq/mysql-test/eloq_main/t/charset_client_win.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/charset_client_win.test rename to storage/eloq/mysql-test/eloq_main/t/charset_client_win.test diff --git a/storage/eloq/mysql-test/mono_main/t/check.test b/storage/eloq/mysql-test/eloq_main/t/check.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/check.test rename to storage/eloq/mysql-test/eloq_main/t/check.test diff --git a/storage/eloq/mysql-test/mono_main/t/check_constraint.test b/storage/eloq/mysql-test/eloq_main/t/check_constraint.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/check_constraint.test rename to storage/eloq/mysql-test/eloq_main/t/check_constraint.test diff --git a/storage/eloq/mysql-test/mono_main/t/check_constraint_innodb.test b/storage/eloq/mysql-test/eloq_main/t/check_constraint_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/check_constraint_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/check_constraint_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/check_constraint_show.test b/storage/eloq/mysql-test/eloq_main/t/check_constraint_show.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/check_constraint_show.test rename to storage/eloq/mysql-test/eloq_main/t/check_constraint_show.test diff --git a/storage/eloq/mysql-test/mono_main/t/cli_options_force_protocol_not_win.test b/storage/eloq/mysql-test/eloq_main/t/cli_options_force_protocol_not_win.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cli_options_force_protocol_not_win.test rename to storage/eloq/mysql-test/eloq_main/t/cli_options_force_protocol_not_win.test diff --git a/storage/eloq/mysql-test/mono_main/t/cli_options_force_protocol_win.opt b/storage/eloq/mysql-test/eloq_main/t/cli_options_force_protocol_win.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cli_options_force_protocol_win.opt rename to storage/eloq/mysql-test/eloq_main/t/cli_options_force_protocol_win.opt diff --git a/storage/eloq/mysql-test/mono_main/t/cli_options_force_protocol_win.test b/storage/eloq/mysql-test/eloq_main/t/cli_options_force_protocol_win.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cli_options_force_protocol_win.test rename to storage/eloq/mysql-test/eloq_main/t/cli_options_force_protocol_win.test diff --git a/storage/eloq/mysql-test/mono_main/t/client_xml.test b/storage/eloq/mysql-test/eloq_main/t/client_xml.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/client_xml.test rename to storage/eloq/mysql-test/eloq_main/t/client_xml.test diff --git a/storage/eloq/mysql-test/mono_main/t/column_compression.inc b/storage/eloq/mysql-test/eloq_main/t/column_compression.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/column_compression.inc rename to storage/eloq/mysql-test/eloq_main/t/column_compression.inc diff --git a/storage/eloq/mysql-test/mono_main/t/column_compression.test b/storage/eloq/mysql-test/eloq_main/t/column_compression.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/column_compression.test rename to storage/eloq/mysql-test/eloq_main/t/column_compression.test diff --git a/storage/eloq/mysql-test/mono_main/t/column_compression_parts.test b/storage/eloq/mysql-test/eloq_main/t/column_compression_parts.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/column_compression_parts.test rename to storage/eloq/mysql-test/eloq_main/t/column_compression_parts.test diff --git a/storage/eloq/mysql-test/mono_main/t/column_compression_rpl.opt b/storage/eloq/mysql-test/eloq_main/t/column_compression_rpl.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/column_compression_rpl.opt rename to storage/eloq/mysql-test/eloq_main/t/column_compression_rpl.opt diff --git a/storage/eloq/mysql-test/mono_main/t/column_compression_rpl.test b/storage/eloq/mysql-test/eloq_main/t/column_compression_rpl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/column_compression_rpl.test rename to storage/eloq/mysql-test/eloq_main/t/column_compression_rpl.test diff --git a/storage/eloq/mysql-test/mono_main/t/column_compression_utf16.test b/storage/eloq/mysql-test/eloq_main/t/column_compression_utf16.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/column_compression_utf16.test rename to storage/eloq/mysql-test/eloq_main/t/column_compression_utf16.test diff --git a/storage/eloq/mysql-test/mono_main/t/comment_column.test b/storage/eloq/mysql-test/eloq_main/t/comment_column.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/comment_column.test rename to storage/eloq/mysql-test/eloq_main/t/comment_column.test diff --git a/storage/eloq/mysql-test/mono_main/t/comment_column2.test b/storage/eloq/mysql-test/eloq_main/t/comment_column2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/comment_column2.test rename to storage/eloq/mysql-test/eloq_main/t/comment_column2.test diff --git a/storage/eloq/mysql-test/mono_main/t/comment_database.test b/storage/eloq/mysql-test/eloq_main/t/comment_database.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/comment_database.test rename to storage/eloq/mysql-test/eloq_main/t/comment_database.test diff --git a/storage/eloq/mysql-test/mono_main/t/comment_index.test b/storage/eloq/mysql-test/eloq_main/t/comment_index.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/comment_index.test rename to storage/eloq/mysql-test/eloq_main/t/comment_index.test diff --git a/storage/eloq/mysql-test/mono_main/t/comment_table.test b/storage/eloq/mysql-test/eloq_main/t/comment_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/comment_table.test rename to storage/eloq/mysql-test/eloq_main/t/comment_table.test diff --git a/storage/eloq/mysql-test/mono_main/t/comments.test b/storage/eloq/mysql-test/eloq_main/t/comments.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/comments.test rename to storage/eloq/mysql-test/eloq_main/t/comments.test diff --git a/storage/eloq/mysql-test/mono_main/t/commit.opt b/storage/eloq/mysql-test/eloq_main/t/commit.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/commit.opt rename to storage/eloq/mysql-test/eloq_main/t/commit.opt diff --git a/storage/eloq/mysql-test/mono_main/t/commit.test b/storage/eloq/mysql-test/eloq_main/t/commit.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/commit.test rename to storage/eloq/mysql-test/eloq_main/t/commit.test diff --git a/storage/eloq/mysql-test/mono_main/t/commit_1innodb.test b/storage/eloq/mysql-test/eloq_main/t/commit_1innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/commit_1innodb.test rename to storage/eloq/mysql-test/eloq_main/t/commit_1innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/compare.test b/storage/eloq/mysql-test/eloq_main/t/compare.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/compare.test rename to storage/eloq/mysql-test/eloq_main/t/compare.test diff --git a/storage/eloq/mysql-test/mono_main/t/compound.test b/storage/eloq/mysql-test/eloq_main/t/compound.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/compound.test rename to storage/eloq/mysql-test/eloq_main/t/compound.test diff --git a/storage/eloq/mysql-test/mono_main/t/compress.test b/storage/eloq/mysql-test/eloq_main/t/compress.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/compress.test rename to storage/eloq/mysql-test/eloq_main/t/compress.test diff --git a/storage/eloq/mysql-test/mono_main/t/concurrent_innodb_safelog.test b/storage/eloq/mysql-test/eloq_main/t/concurrent_innodb_safelog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/concurrent_innodb_safelog.test rename to storage/eloq/mysql-test/eloq_main/t/concurrent_innodb_safelog.test diff --git a/storage/eloq/mysql-test/mono_main/t/concurrent_innodb_unsafelog.test b/storage/eloq/mysql-test/eloq_main/t/concurrent_innodb_unsafelog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/concurrent_innodb_unsafelog.test rename to storage/eloq/mysql-test/eloq_main/t/concurrent_innodb_unsafelog.test diff --git a/storage/eloq/mysql-test/mono_main/t/connect-abstract.cnf b/storage/eloq/mysql-test/eloq_main/t/connect-abstract.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/connect-abstract.cnf rename to storage/eloq/mysql-test/eloq_main/t/connect-abstract.cnf diff --git a/storage/eloq/mysql-test/mono_main/t/connect-abstract.test b/storage/eloq/mysql-test/eloq_main/t/connect-abstract.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/connect-abstract.test rename to storage/eloq/mysql-test/eloq_main/t/connect-abstract.test diff --git a/storage/eloq/mysql-test/mono_main/t/connect.cnf b/storage/eloq/mysql-test/eloq_main/t/connect.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/connect.cnf rename to storage/eloq/mysql-test/eloq_main/t/connect.cnf diff --git a/storage/eloq/mysql-test/mono_main/t/connect.test b/storage/eloq/mysql-test/eloq_main/t/connect.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/connect.test rename to storage/eloq/mysql-test/eloq_main/t/connect.test diff --git a/storage/eloq/mysql-test/mono_main/t/connect2.cnf b/storage/eloq/mysql-test/eloq_main/t/connect2.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/connect2.cnf rename to storage/eloq/mysql-test/eloq_main/t/connect2.cnf diff --git a/storage/eloq/mysql-test/mono_main/t/connect2.test b/storage/eloq/mysql-test/eloq_main/t/connect2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/connect2.test rename to storage/eloq/mysql-test/eloq_main/t/connect2.test diff --git a/storage/eloq/mysql-test/mono_main/t/connect_debug.test b/storage/eloq/mysql-test/eloq_main/t/connect_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/connect_debug.test rename to storage/eloq/mysql-test/eloq_main/t/connect_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/consistent_snapshot.opt b/storage/eloq/mysql-test/eloq_main/t/consistent_snapshot.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/consistent_snapshot.opt rename to storage/eloq/mysql-test/eloq_main/t/consistent_snapshot.opt diff --git a/storage/eloq/mysql-test/mono_main/t/consistent_snapshot.test b/storage/eloq/mysql-test/eloq_main/t/consistent_snapshot.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/consistent_snapshot.test rename to storage/eloq/mysql-test/eloq_main/t/consistent_snapshot.test diff --git a/storage/eloq/mysql-test/mono_main/t/constraints.test b/storage/eloq/mysql-test/eloq_main/t/constraints.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/constraints.test rename to storage/eloq/mysql-test/eloq_main/t/constraints.test diff --git a/storage/eloq/mysql-test/mono_main/t/contributors.test b/storage/eloq/mysql-test/eloq_main/t/contributors.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/contributors.test rename to storage/eloq/mysql-test/eloq_main/t/contributors.test diff --git a/storage/eloq/mysql-test/mono_main/t/count_distinct.test b/storage/eloq/mysql-test/eloq_main/t/count_distinct.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/count_distinct.test rename to storage/eloq/mysql-test/eloq_main/t/count_distinct.test diff --git a/storage/eloq/mysql-test/mono_main/t/count_distinct2-master.opt b/storage/eloq/mysql-test/eloq_main/t/count_distinct2-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/count_distinct2-master.opt rename to storage/eloq/mysql-test/eloq_main/t/count_distinct2-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/count_distinct2.test b/storage/eloq/mysql-test/eloq_main/t/count_distinct2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/count_distinct2.test rename to storage/eloq/mysql-test/eloq_main/t/count_distinct2.test diff --git a/storage/eloq/mysql-test/mono_main/t/count_distinct3.test b/storage/eloq/mysql-test/eloq_main/t/count_distinct3.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/count_distinct3.test rename to storage/eloq/mysql-test/eloq_main/t/count_distinct3.test diff --git a/storage/eloq/mysql-test/mono_main/t/crash_commit_before-master.opt b/storage/eloq/mysql-test/eloq_main/t/crash_commit_before-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/crash_commit_before-master.opt rename to storage/eloq/mysql-test/eloq_main/t/crash_commit_before-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/crash_commit_before.test b/storage/eloq/mysql-test/eloq_main/t/crash_commit_before.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/crash_commit_before.test rename to storage/eloq/mysql-test/eloq_main/t/crash_commit_before.test diff --git a/storage/eloq/mysql-test/mono_main/t/create-big.test b/storage/eloq/mysql-test/eloq_main/t/create-big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create-big.test rename to storage/eloq/mysql-test/eloq_main/t/create-big.test diff --git a/storage/eloq/mysql-test/mono_main/t/create-uca.test b/storage/eloq/mysql-test/eloq_main/t/create-uca.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create-uca.test rename to storage/eloq/mysql-test/eloq_main/t/create-uca.test diff --git a/storage/eloq/mysql-test/mono_main/t/create.test b/storage/eloq/mysql-test/eloq_main/t/create.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create.test rename to storage/eloq/mysql-test/eloq_main/t/create.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_delayed.test b/storage/eloq/mysql-test/eloq_main/t/create_delayed.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_delayed.test rename to storage/eloq/mysql-test/eloq_main/t/create_delayed.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_binlog.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_binlog.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_db.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_db.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_db.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_db.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_event.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_event.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_event.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_event.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_function.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_function.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_function.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_function.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_index.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_index.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_index.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_index.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_procedure.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_procedure.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_procedure.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_procedure.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_role.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_role.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_role.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_role.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_server.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_server.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_server.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_server.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_trigger.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_trigger.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_trigger.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_trigger.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_udf.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_udf.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_udf.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_udf.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_user.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_user.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_user.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_user.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_drop_view.test b/storage/eloq/mysql-test/eloq_main/t/create_drop_view.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_drop_view.test rename to storage/eloq/mysql-test/eloq_main/t/create_drop_view.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_not_windows.test b/storage/eloq/mysql-test/eloq_main/t/create_not_windows.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_not_windows.test rename to storage/eloq/mysql-test/eloq_main/t/create_not_windows.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_or_replace-master.opt b/storage/eloq/mysql-test/eloq_main/t/create_or_replace-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_or_replace-master.opt rename to storage/eloq/mysql-test/eloq_main/t/create_or_replace-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/create_or_replace.test b/storage/eloq/mysql-test/eloq_main/t/create_or_replace.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_or_replace.test rename to storage/eloq/mysql-test/eloq_main/t/create_or_replace.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_or_replace2.test b/storage/eloq/mysql-test/eloq_main/t/create_or_replace2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_or_replace2.test rename to storage/eloq/mysql-test/eloq_main/t/create_or_replace2.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_or_replace_permission.test b/storage/eloq/mysql-test/eloq_main/t/create_or_replace_permission.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_or_replace_permission.test rename to storage/eloq/mysql-test/eloq_main/t/create_or_replace_permission.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_replace_tmp.test b/storage/eloq/mysql-test/eloq_main/t/create_replace_tmp.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_replace_tmp.test rename to storage/eloq/mysql-test/eloq_main/t/create_replace_tmp.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_select_tmp.test b/storage/eloq/mysql-test/eloq_main/t/create_select_tmp.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_select_tmp.test rename to storage/eloq/mysql-test/eloq_main/t/create_select_tmp.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_user.test b/storage/eloq/mysql-test/eloq_main/t/create_user.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_user.test rename to storage/eloq/mysql-test/eloq_main/t/create_user.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_utf8.test b/storage/eloq/mysql-test/eloq_main/t/create_utf8.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_utf8.test rename to storage/eloq/mysql-test/eloq_main/t/create_utf8.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_w_max_indexes_128.test b/storage/eloq/mysql-test/eloq_main/t/create_w_max_indexes_128.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_w_max_indexes_128.test rename to storage/eloq/mysql-test/eloq_main/t/create_w_max_indexes_128.test diff --git a/storage/eloq/mysql-test/mono_main/t/create_w_max_indexes_64.test b/storage/eloq/mysql-test/eloq_main/t/create_w_max_indexes_64.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/create_w_max_indexes_64.test rename to storage/eloq/mysql-test/eloq_main/t/create_w_max_indexes_64.test diff --git a/storage/eloq/mysql-test/mono_main/t/cte_cycle.test b/storage/eloq/mysql-test/eloq_main/t/cte_cycle.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cte_cycle.test rename to storage/eloq/mysql-test/eloq_main/t/cte_cycle.test diff --git a/storage/eloq/mysql-test/mono_main/t/cte_grant.test b/storage/eloq/mysql-test/eloq_main/t/cte_grant.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cte_grant.test rename to storage/eloq/mysql-test/eloq_main/t/cte_grant.test diff --git a/storage/eloq/mysql-test/mono_main/t/cte_nonrecursive.test b/storage/eloq/mysql-test/eloq_main/t/cte_nonrecursive.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cte_nonrecursive.test rename to storage/eloq/mysql-test/eloq_main/t/cte_nonrecursive.test diff --git a/storage/eloq/mysql-test/mono_main/t/cte_nonrecursive_not_embedded.test b/storage/eloq/mysql-test/eloq_main/t/cte_nonrecursive_not_embedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cte_nonrecursive_not_embedded.test rename to storage/eloq/mysql-test/eloq_main/t/cte_nonrecursive_not_embedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/cte_recursive.test b/storage/eloq/mysql-test/eloq_main/t/cte_recursive.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cte_recursive.test rename to storage/eloq/mysql-test/eloq_main/t/cte_recursive.test diff --git a/storage/eloq/mysql-test/mono_main/t/cte_recursive_not_embedded.test b/storage/eloq/mysql-test/eloq_main/t/cte_recursive_not_embedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/cte_recursive_not_embedded.test rename to storage/eloq/mysql-test/eloq_main/t/cte_recursive_not_embedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_ascii.test b/storage/eloq/mysql-test/eloq_main/t/ctype_ascii.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_ascii.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_ascii.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_big5.test b/storage/eloq/mysql-test/eloq_main/t/ctype_big5.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_big5.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_big5.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_binary.test b/storage/eloq/mysql-test/eloq_main/t/ctype_binary.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_binary.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_binary.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_collate.test b/storage/eloq/mysql-test/eloq_main/t/ctype_collate.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_collate.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_collate.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_cp1250_ch.test b/storage/eloq/mysql-test/eloq_main/t/ctype_cp1250_ch.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_cp1250_ch.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_cp1250_ch.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_cp1251.test b/storage/eloq/mysql-test/eloq_main/t/ctype_cp1251.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_cp1251.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_cp1251.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_cp850.test b/storage/eloq/mysql-test/eloq_main/t/ctype_cp850.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_cp850.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_cp850.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_cp932.test b/storage/eloq/mysql-test/eloq_main/t/ctype_cp932.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_cp932.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_cp932.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_cp932_binlog_row.test b/storage/eloq/mysql-test/eloq_main/t/ctype_cp932_binlog_row.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_cp932_binlog_row.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_cp932_binlog_row.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_cp932_binlog_stm.test b/storage/eloq/mysql-test/eloq_main/t/ctype_cp932_binlog_stm.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_cp932_binlog_stm.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_cp932_binlog_stm.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_create.test b/storage/eloq/mysql-test/eloq_main/t/ctype_create.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_create.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_create.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_dec8.test b/storage/eloq/mysql-test/eloq_main/t/ctype_dec8.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_dec8.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_dec8.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_errors.test b/storage/eloq/mysql-test/eloq_main/t/ctype_errors.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_errors.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_errors.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_eucjpms.test b/storage/eloq/mysql-test/eloq_main/t/ctype_eucjpms.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_eucjpms.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_eucjpms.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_euckr.test b/storage/eloq/mysql-test/eloq_main/t/ctype_euckr.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_euckr.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_euckr.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_filename.test b/storage/eloq/mysql-test/eloq_main/t/ctype_filename.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_filename.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_filename.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_filesystem-master.opt b/storage/eloq/mysql-test/eloq_main/t/ctype_filesystem-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_filesystem-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ctype_filesystem-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_filesystem.test b/storage/eloq/mysql-test/eloq_main/t/ctype_filesystem.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_filesystem.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_filesystem.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_gb2312.test b/storage/eloq/mysql-test/eloq_main/t/ctype_gb2312.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_gb2312.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_gb2312.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_gbk.test b/storage/eloq/mysql-test/eloq_main/t/ctype_gbk.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_gbk.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_gbk.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_gbk_binlog.test b/storage/eloq/mysql-test/eloq_main/t/ctype_gbk_binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_gbk_binlog.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_gbk_binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_gbk_export_import.test b/storage/eloq/mysql-test/eloq_main/t/ctype_gbk_export_import.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_gbk_export_import.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_gbk_export_import.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_hebrew.test b/storage/eloq/mysql-test/eloq_main/t/ctype_hebrew.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_hebrew.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_hebrew.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_latin1.test b/storage/eloq/mysql-test/eloq_main/t/ctype_latin1.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_latin1.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_latin1.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_latin1_de.test b/storage/eloq/mysql-test/eloq_main/t/ctype_latin1_de.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_latin1_de.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_latin1_de.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_latin2.test b/storage/eloq/mysql-test/eloq_main/t/ctype_latin2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_latin2.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_latin2.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_latin2_ch.test b/storage/eloq/mysql-test/eloq_main/t/ctype_latin2_ch.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_latin2_ch.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_latin2_ch.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_ldml-master.opt b/storage/eloq/mysql-test/eloq_main/t/ctype_ldml-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_ldml-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ctype_ldml-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_ldml.test b/storage/eloq/mysql-test/eloq_main/t/ctype_ldml.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_ldml.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_ldml.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_like_range.test b/storage/eloq/mysql-test/eloq_main/t/ctype_like_range.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_like_range.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_like_range.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_many.test b/storage/eloq/mysql-test/eloq_main/t/ctype_many.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_many.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_many.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_mb.test b/storage/eloq/mysql-test/eloq_main/t/ctype_mb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_mb.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_mb.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_nopad_8bit.test b/storage/eloq/mysql-test/eloq_main/t/ctype_nopad_8bit.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_nopad_8bit.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_nopad_8bit.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_partitions.test b/storage/eloq/mysql-test/eloq_main/t/ctype_partitions.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_partitions.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_partitions.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_recoding.test b/storage/eloq/mysql-test/eloq_main/t/ctype_recoding.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_recoding.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_recoding.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_sjis.test b/storage/eloq/mysql-test/eloq_main/t/ctype_sjis.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_sjis.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_sjis.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_swe7.test b/storage/eloq/mysql-test/eloq_main/t/ctype_swe7.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_swe7.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_swe7.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_tis620.test b/storage/eloq/mysql-test/eloq_main/t/ctype_tis620.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_tis620.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_tis620.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_uca.test b/storage/eloq/mysql-test/eloq_main/t/ctype_uca.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_uca.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_uca.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_uca_innodb.test b/storage/eloq/mysql-test/eloq_main/t/ctype_uca_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_uca_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_uca_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_uca_partitions.test b/storage/eloq/mysql-test/eloq_main/t/ctype_uca_partitions.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_uca_partitions.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_uca_partitions.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_ucs.test b/storage/eloq/mysql-test/eloq_main/t/ctype_ucs.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_ucs.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_ucs.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_ucs2_def-master.opt b/storage/eloq/mysql-test/eloq_main/t/ctype_ucs2_def-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_ucs2_def-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ctype_ucs2_def-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_ucs2_def.test b/storage/eloq/mysql-test/eloq_main/t/ctype_ucs2_def.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_ucs2_def.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_ucs2_def.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_ucs2_query_cache-master.opt b/storage/eloq/mysql-test/eloq_main/t/ctype_ucs2_query_cache-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_ucs2_query_cache-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ctype_ucs2_query_cache-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_ucs2_query_cache.test b/storage/eloq/mysql-test/eloq_main/t/ctype_ucs2_query_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_ucs2_query_cache.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_ucs2_query_cache.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_ucs2_uca.test b/storage/eloq/mysql-test/eloq_main/t/ctype_ucs2_uca.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_ucs2_uca.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_ucs2_uca.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_ujis.test b/storage/eloq/mysql-test/eloq_main/t/ctype_ujis.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_ujis.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_ujis.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_ujis_ucs2.test b/storage/eloq/mysql-test/eloq_main/t/ctype_ujis_ucs2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_ujis_ucs2.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_ujis_ucs2.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_upgrade.test b/storage/eloq/mysql-test/eloq_main/t/ctype_upgrade.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_upgrade.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_upgrade.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf16.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf16.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf16.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf16.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf16_def-master.opt b/storage/eloq/mysql-test/eloq_main/t/ctype_utf16_def-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf16_def-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf16_def-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf16_def.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf16_def.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf16_def.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf16_def.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf16_uca.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf16_uca.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf16_uca.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf16_uca.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf16le.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf16le.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf16le.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf16le.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf32.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf32.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf32.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf32.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf32_def.opt b/storage/eloq/mysql-test/eloq_main/t/ctype_utf32_def.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf32_def.opt rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf32_def.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf32_def.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf32_def.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf32_def.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf32_def.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf32_uca.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf32_uca.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf32_uca.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf32_uca.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8-master.opt b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8_def_upgrade.opt b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8_def_upgrade.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8_def_upgrade.opt rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8_def_upgrade.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8_def_upgrade.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8_def_upgrade.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8_def_upgrade.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8_def_upgrade.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8_uca.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8_uca.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8_uca.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8_uca.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4-master.opt b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4_heap.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4_heap.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4_heap.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4_heap.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4_innodb-master.opt b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4_innodb-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4_innodb-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4_innodb-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4_innodb.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4_myisam.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4_myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4_myisam.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4_myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4_uca.test b/storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4_uca.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ctype_utf8mb4_uca.test rename to storage/eloq/mysql-test/eloq_main/t/ctype_utf8mb4_uca.test diff --git a/storage/eloq/mysql-test/mono_main/t/custom_aggregate_functions.test b/storage/eloq/mysql-test/eloq_main/t/custom_aggregate_functions.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/custom_aggregate_functions.test rename to storage/eloq/mysql-test/eloq_main/t/custom_aggregate_functions.test diff --git a/storage/eloq/mysql-test/mono_main/t/custom_aggregates_i_s.test b/storage/eloq/mysql-test/eloq_main/t/custom_aggregates_i_s.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/custom_aggregates_i_s.test rename to storage/eloq/mysql-test/eloq_main/t/custom_aggregates_i_s.test diff --git a/storage/eloq/mysql-test/mono_main/t/date_formats-master.opt b/storage/eloq/mysql-test/eloq_main/t/date_formats-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/date_formats-master.opt rename to storage/eloq/mysql-test/eloq_main/t/date_formats-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/date_formats.test b/storage/eloq/mysql-test/eloq_main/t/date_formats.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/date_formats.test rename to storage/eloq/mysql-test/eloq_main/t/date_formats.test diff --git a/storage/eloq/mysql-test/mono_main/t/datetime_456.test b/storage/eloq/mysql-test/eloq_main/t/datetime_456.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/datetime_456.test rename to storage/eloq/mysql-test/eloq_main/t/datetime_456.test diff --git a/storage/eloq/mysql-test/mono_main/t/ddl_i18n_koi8r.test b/storage/eloq/mysql-test/eloq_main/t/ddl_i18n_koi8r.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ddl_i18n_koi8r.test rename to storage/eloq/mysql-test/eloq_main/t/ddl_i18n_koi8r.test diff --git a/storage/eloq/mysql-test/mono_main/t/ddl_i18n_utf8.test b/storage/eloq/mysql-test/eloq_main/t/ddl_i18n_utf8.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ddl_i18n_utf8.test rename to storage/eloq/mysql-test/eloq_main/t/ddl_i18n_utf8.test diff --git a/storage/eloq/mysql-test/mono_main/t/deadlock_ftwrl.test b/storage/eloq/mysql-test/eloq_main/t/deadlock_ftwrl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/deadlock_ftwrl.test rename to storage/eloq/mysql-test/eloq_main/t/deadlock_ftwrl.test diff --git a/storage/eloq/mysql-test/mono_main/t/deadlock_innodb.test b/storage/eloq/mysql-test/eloq_main/t/deadlock_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/deadlock_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/deadlock_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/debug_sync.test b/storage/eloq/mysql-test/eloq_main/t/debug_sync.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/debug_sync.test rename to storage/eloq/mysql-test/eloq_main/t/debug_sync.test diff --git a/storage/eloq/mysql-test/mono_main/t/default.test b/storage/eloq/mysql-test/eloq_main/t/default.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/default.test rename to storage/eloq/mysql-test/eloq_main/t/default.test diff --git a/storage/eloq/mysql-test/mono_main/t/default_debug.test b/storage/eloq/mysql-test/eloq_main/t/default_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/default_debug.test rename to storage/eloq/mysql-test/eloq_main/t/default_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/default_session.test b/storage/eloq/mysql-test/eloq_main/t/default_session.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/default_session.test rename to storage/eloq/mysql-test/eloq_main/t/default_session.test diff --git a/storage/eloq/mysql-test/mono_main/t/default_storage_engine.test b/storage/eloq/mysql-test/eloq_main/t/default_storage_engine.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/default_storage_engine.test rename to storage/eloq/mysql-test/eloq_main/t/default_storage_engine.test diff --git a/storage/eloq/mysql-test/mono_main/t/delayed.test b/storage/eloq/mysql-test/eloq_main/t/delayed.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/delayed.test rename to storage/eloq/mysql-test/eloq_main/t/delayed.test diff --git a/storage/eloq/mysql-test/mono_main/t/delayed_blob.opt b/storage/eloq/mysql-test/eloq_main/t/delayed_blob.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/delayed_blob.opt rename to storage/eloq/mysql-test/eloq_main/t/delayed_blob.opt diff --git a/storage/eloq/mysql-test/mono_main/t/delayed_blob.test b/storage/eloq/mysql-test/eloq_main/t/delayed_blob.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/delayed_blob.test rename to storage/eloq/mysql-test/eloq_main/t/delayed_blob.test diff --git a/storage/eloq/mysql-test/mono_main/t/delete.test b/storage/eloq/mysql-test/eloq_main/t/delete.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/delete.test rename to storage/eloq/mysql-test/eloq_main/t/delete.test diff --git a/storage/eloq/mysql-test/mono_main/t/delete_innodb.test b/storage/eloq/mysql-test/eloq_main/t/delete_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/delete_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/delete_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/delete_returning.test b/storage/eloq/mysql-test/eloq_main/t/delete_returning.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/delete_returning.test rename to storage/eloq/mysql-test/eloq_main/t/delete_returning.test diff --git a/storage/eloq/mysql-test/mono_main/t/delete_returning_grant.test b/storage/eloq/mysql-test/eloq_main/t/delete_returning_grant.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/delete_returning_grant.test rename to storage/eloq/mysql-test/eloq_main/t/delete_returning_grant.test diff --git a/storage/eloq/mysql-test/mono_main/t/delete_use_source.test b/storage/eloq/mysql-test/eloq_main/t/delete_use_source.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/delete_use_source.test rename to storage/eloq/mysql-test/eloq_main/t/delete_use_source.test diff --git a/storage/eloq/mysql-test/mono_main/t/delimiter_case_mdev_10728.sql b/storage/eloq/mysql-test/eloq_main/t/delimiter_case_mdev_10728.sql similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/delimiter_case_mdev_10728.sql rename to storage/eloq/mysql-test/eloq_main/t/delimiter_case_mdev_10728.sql diff --git a/storage/eloq/mysql-test/mono_main/t/delimiter_command_case_sensitivity.test b/storage/eloq/mysql-test/eloq_main/t/delimiter_command_case_sensitivity.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/delimiter_command_case_sensitivity.test rename to storage/eloq/mysql-test/eloq_main/t/delimiter_command_case_sensitivity.test diff --git a/storage/eloq/mysql-test/mono_main/t/deprecated_features.test b/storage/eloq/mysql-test/eloq_main/t/deprecated_features.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/deprecated_features.test rename to storage/eloq/mysql-test/eloq_main/t/deprecated_features.test diff --git a/storage/eloq/mysql-test/mono_main/t/derived.test b/storage/eloq/mysql-test/eloq_main/t/derived.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/derived.test rename to storage/eloq/mysql-test/eloq_main/t/derived.test diff --git a/storage/eloq/mysql-test/mono_main/t/derived_cond_pushdown.test b/storage/eloq/mysql-test/eloq_main/t/derived_cond_pushdown.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/derived_cond_pushdown.test rename to storage/eloq/mysql-test/eloq_main/t/derived_cond_pushdown.test diff --git a/storage/eloq/mysql-test/mono_main/t/derived_opt.test b/storage/eloq/mysql-test/eloq_main/t/derived_opt.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/derived_opt.test rename to storage/eloq/mysql-test/eloq_main/t/derived_opt.test diff --git a/storage/eloq/mysql-test/mono_main/t/derived_split_innodb.test b/storage/eloq/mysql-test/eloq_main/t/derived_split_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/derived_split_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/derived_split_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/derived_view.test b/storage/eloq/mysql-test/eloq_main/t/derived_view.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/derived_view.test rename to storage/eloq/mysql-test/eloq_main/t/derived_view.test diff --git a/storage/eloq/mysql-test/mono_main/t/dirty_close.test b/storage/eloq/mysql-test/eloq_main/t/dirty_close.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/dirty_close.test rename to storage/eloq/mysql-test/eloq_main/t/dirty_close.test diff --git a/storage/eloq/mysql-test/mono_main/t/distinct.test b/storage/eloq/mysql-test/eloq_main/t/distinct.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/distinct.test rename to storage/eloq/mysql-test/eloq_main/t/distinct.test diff --git a/storage/eloq/mysql-test/mono_main/t/drop.test b/storage/eloq/mysql-test/eloq_main/t/drop.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/drop.test rename to storage/eloq/mysql-test/eloq_main/t/drop.test diff --git a/storage/eloq/mysql-test/mono_main/t/drop_bad_db_type.test b/storage/eloq/mysql-test/eloq_main/t/drop_bad_db_type.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/drop_bad_db_type.test rename to storage/eloq/mysql-test/eloq_main/t/drop_bad_db_type.test diff --git a/storage/eloq/mysql-test/mono_main/t/drop_combinations.inc b/storage/eloq/mysql-test/eloq_main/t/drop_combinations.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/drop_combinations.inc rename to storage/eloq/mysql-test/eloq_main/t/drop_combinations.inc diff --git a/storage/eloq/mysql-test/mono_main/t/drop_combinations.test b/storage/eloq/mysql-test/eloq_main/t/drop_combinations.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/drop_combinations.test rename to storage/eloq/mysql-test/eloq_main/t/drop_combinations.test diff --git a/storage/eloq/mysql-test/mono_main/t/drop_table_force.test b/storage/eloq/mysql-test/eloq_main/t/drop_table_force.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/drop_table_force.test rename to storage/eloq/mysql-test/eloq_main/t/drop_table_force.test diff --git a/storage/eloq/mysql-test/mono_main/t/dyncol.test b/storage/eloq/mysql-test/eloq_main/t/dyncol.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/dyncol.test rename to storage/eloq/mysql-test/eloq_main/t/dyncol.test diff --git a/storage/eloq/mysql-test/mono_main/t/empty_server_name-8224.test b/storage/eloq/mysql-test/eloq_main/t/empty_server_name-8224.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/empty_server_name-8224.test rename to storage/eloq/mysql-test/eloq_main/t/empty_server_name-8224.test diff --git a/storage/eloq/mysql-test/mono_main/t/empty_string_literal.test b/storage/eloq/mysql-test/eloq_main/t/empty_string_literal.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/empty_string_literal.test rename to storage/eloq/mysql-test/eloq_main/t/empty_string_literal.test diff --git a/storage/eloq/mysql-test/mono_main/t/empty_table.test b/storage/eloq/mysql-test/eloq_main/t/empty_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/empty_table.test rename to storage/eloq/mysql-test/eloq_main/t/empty_table.test diff --git a/storage/eloq/mysql-test/mono_main/t/empty_user_table.test b/storage/eloq/mysql-test/eloq_main/t/empty_user_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/empty_user_table.test rename to storage/eloq/mysql-test/eloq_main/t/empty_user_table.test diff --git a/storage/eloq/mysql-test/mono_main/t/endspace.test b/storage/eloq/mysql-test/eloq_main/t/endspace.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/endspace.test rename to storage/eloq/mysql-test/eloq_main/t/endspace.test diff --git a/storage/eloq/mysql-test/mono_main/t/enforce_storage_engine.test b/storage/eloq/mysql-test/eloq_main/t/enforce_storage_engine.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/enforce_storage_engine.test rename to storage/eloq/mysql-test/eloq_main/t/enforce_storage_engine.test diff --git a/storage/eloq/mysql-test/mono_main/t/enforce_storage_engine_opt.opt b/storage/eloq/mysql-test/eloq_main/t/enforce_storage_engine_opt.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/enforce_storage_engine_opt.opt rename to storage/eloq/mysql-test/eloq_main/t/enforce_storage_engine_opt.opt diff --git a/storage/eloq/mysql-test/mono_main/t/enforce_storage_engine_opt.test b/storage/eloq/mysql-test/eloq_main/t/enforce_storage_engine_opt.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/enforce_storage_engine_opt.test rename to storage/eloq/mysql-test/eloq_main/t/enforce_storage_engine_opt.test diff --git a/storage/eloq/mysql-test/mono_main/t/engine_error_in_alter-8453.test b/storage/eloq/mysql-test/eloq_main/t/engine_error_in_alter-8453.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/engine_error_in_alter-8453.test rename to storage/eloq/mysql-test/eloq_main/t/engine_error_in_alter-8453.test diff --git a/storage/eloq/mysql-test/mono_main/t/error_simulation-master.opt b/storage/eloq/mysql-test/eloq_main/t/error_simulation-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/error_simulation-master.opt rename to storage/eloq/mysql-test/eloq_main/t/error_simulation-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/error_simulation.test b/storage/eloq/mysql-test/eloq_main/t/error_simulation.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/error_simulation.test rename to storage/eloq/mysql-test/eloq_main/t/error_simulation.test diff --git a/storage/eloq/mysql-test/mono_main/t/errors.test b/storage/eloq/mysql-test/eloq_main/t/errors.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/errors.test rename to storage/eloq/mysql-test/eloq_main/t/errors.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_1.test b/storage/eloq/mysql-test/eloq_main/t/events_1.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_1.test rename to storage/eloq/mysql-test/eloq_main/t/events_1.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_2.test b/storage/eloq/mysql-test/eloq_main/t/events_2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_2.test rename to storage/eloq/mysql-test/eloq_main/t/events_2.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_bugs-master.opt b/storage/eloq/mysql-test/eloq_main/t/events_bugs-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_bugs-master.opt rename to storage/eloq/mysql-test/eloq_main/t/events_bugs-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/events_bugs.test b/storage/eloq/mysql-test/eloq_main/t/events_bugs.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_bugs.test rename to storage/eloq/mysql-test/eloq_main/t/events_bugs.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_embedded.test b/storage/eloq/mysql-test/eloq_main/t/events_embedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_embedded.test rename to storage/eloq/mysql-test/eloq_main/t/events_embedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_grant.test b/storage/eloq/mysql-test/eloq_main/t/events_grant.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_grant.test rename to storage/eloq/mysql-test/eloq_main/t/events_grant.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_logs_tests-master.opt b/storage/eloq/mysql-test/eloq_main/t/events_logs_tests-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_logs_tests-master.opt rename to storage/eloq/mysql-test/eloq_main/t/events_logs_tests-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/events_logs_tests.test b/storage/eloq/mysql-test/eloq_main/t/events_logs_tests.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_logs_tests.test rename to storage/eloq/mysql-test/eloq_main/t/events_logs_tests.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_microsec.test b/storage/eloq/mysql-test/eloq_main/t/events_microsec.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_microsec.test rename to storage/eloq/mysql-test/eloq_main/t/events_microsec.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_restart-master.opt b/storage/eloq/mysql-test/eloq_main/t/events_restart-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_restart-master.opt rename to storage/eloq/mysql-test/eloq_main/t/events_restart-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/events_restart.test b/storage/eloq/mysql-test/eloq_main/t/events_restart.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_restart.test rename to storage/eloq/mysql-test/eloq_main/t/events_restart.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_scheduling.test b/storage/eloq/mysql-test/eloq_main/t/events_scheduling.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_scheduling.test rename to storage/eloq/mysql-test/eloq_main/t/events_scheduling.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_slowlog.test b/storage/eloq/mysql-test/eloq_main/t/events_slowlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_slowlog.test rename to storage/eloq/mysql-test/eloq_main/t/events_slowlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_stress.test b/storage/eloq/mysql-test/eloq_main/t/events_stress.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_stress.test rename to storage/eloq/mysql-test/eloq_main/t/events_stress.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_time_zone.test b/storage/eloq/mysql-test/eloq_main/t/events_time_zone.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_time_zone.test rename to storage/eloq/mysql-test/eloq_main/t/events_time_zone.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_trans.test b/storage/eloq/mysql-test/eloq_main/t/events_trans.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_trans.test rename to storage/eloq/mysql-test/eloq_main/t/events_trans.test diff --git a/storage/eloq/mysql-test/mono_main/t/events_trans_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/events_trans_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/events_trans_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/events_trans_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/except.test b/storage/eloq/mysql-test/eloq_main/t/except.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/except.test rename to storage/eloq/mysql-test/eloq_main/t/except.test diff --git a/storage/eloq/mysql-test/mono_main/t/except_all.test b/storage/eloq/mysql-test/eloq_main/t/except_all.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/except_all.test rename to storage/eloq/mysql-test/eloq_main/t/except_all.test diff --git a/storage/eloq/mysql-test/mono_main/t/execution_constants.test b/storage/eloq/mysql-test/eloq_main/t/execution_constants.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/execution_constants.test rename to storage/eloq/mysql-test/eloq_main/t/execution_constants.test diff --git a/storage/eloq/mysql-test/mono_main/t/explain.test b/storage/eloq/mysql-test/eloq_main/t/explain.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/explain.test rename to storage/eloq/mysql-test/eloq_main/t/explain.test diff --git a/storage/eloq/mysql-test/mono_main/t/explain_json.test b/storage/eloq/mysql-test/eloq_main/t/explain_json.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/explain_json.test rename to storage/eloq/mysql-test/eloq_main/t/explain_json.test diff --git a/storage/eloq/mysql-test/mono_main/t/explain_json_format_partitions.test b/storage/eloq/mysql-test/eloq_main/t/explain_json_format_partitions.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/explain_json_format_partitions.test rename to storage/eloq/mysql-test/eloq_main/t/explain_json_format_partitions.test diff --git a/storage/eloq/mysql-test/mono_main/t/explain_json_innodb.test b/storage/eloq/mysql-test/eloq_main/t/explain_json_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/explain_json_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/explain_json_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/explain_non_select.test b/storage/eloq/mysql-test/eloq_main/t/explain_non_select.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/explain_non_select.test rename to storage/eloq/mysql-test/eloq_main/t/explain_non_select.test diff --git a/storage/eloq/mysql-test/mono_main/t/explain_slowquerylog-master.opt b/storage/eloq/mysql-test/eloq_main/t/explain_slowquerylog-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/explain_slowquerylog-master.opt rename to storage/eloq/mysql-test/eloq_main/t/explain_slowquerylog-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/explain_slowquerylog.test b/storage/eloq/mysql-test/eloq_main/t/explain_slowquerylog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/explain_slowquerylog.test rename to storage/eloq/mysql-test/eloq_main/t/explain_slowquerylog.test diff --git a/storage/eloq/mysql-test/mono_main/t/ext_key_noPK_6794.test b/storage/eloq/mysql-test/eloq_main/t/ext_key_noPK_6794.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ext_key_noPK_6794.test rename to storage/eloq/mysql-test/eloq_main/t/ext_key_noPK_6794.test diff --git a/storage/eloq/mysql-test/mono_main/t/failed_auth_3909.test b/storage/eloq/mysql-test/eloq_main/t/failed_auth_3909.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/failed_auth_3909.test rename to storage/eloq/mysql-test/eloq_main/t/failed_auth_3909.test diff --git a/storage/eloq/mysql-test/mono_main/t/failed_auth_unixsocket.test b/storage/eloq/mysql-test/eloq_main/t/failed_auth_unixsocket.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/failed_auth_unixsocket.test rename to storage/eloq/mysql-test/eloq_main/t/failed_auth_unixsocket.test diff --git a/storage/eloq/mysql-test/mono_main/t/fast_prefix_index_fetch_innodb.test b/storage/eloq/mysql-test/eloq_main/t/fast_prefix_index_fetch_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fast_prefix_index_fetch_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/fast_prefix_index_fetch_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/features.test b/storage/eloq/mysql-test/eloq_main/t/features.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/features.test rename to storage/eloq/mysql-test/eloq_main/t/features.test diff --git a/storage/eloq/mysql-test/mono_main/t/fetch_first.test b/storage/eloq/mysql-test/eloq_main/t/fetch_first.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fetch_first.test rename to storage/eloq/mysql-test/eloq_main/t/fetch_first.test diff --git a/storage/eloq/mysql-test/mono_main/t/file_contents.test b/storage/eloq/mysql-test/eloq_main/t/file_contents.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/file_contents.test rename to storage/eloq/mysql-test/eloq_main/t/file_contents.test diff --git a/storage/eloq/mysql-test/mono_main/t/filesort_bad_i_s-7585.test b/storage/eloq/mysql-test/eloq_main/t/filesort_bad_i_s-7585.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/filesort_bad_i_s-7585.test rename to storage/eloq/mysql-test/eloq_main/t/filesort_bad_i_s-7585.test diff --git a/storage/eloq/mysql-test/mono_main/t/filesort_debug.test b/storage/eloq/mysql-test/eloq_main/t/filesort_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/filesort_debug.test rename to storage/eloq/mysql-test/eloq_main/t/filesort_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/fix_priv_tables.test b/storage/eloq/mysql-test/eloq_main/t/fix_priv_tables.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fix_priv_tables.test rename to storage/eloq/mysql-test/eloq_main/t/fix_priv_tables.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush-innodb-notembedded.test b/storage/eloq/mysql-test/eloq_main/t/flush-innodb-notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush-innodb-notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/flush-innodb-notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush-innodb.test b/storage/eloq/mysql-test/eloq_main/t/flush-innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush-innodb.test rename to storage/eloq/mysql-test/eloq_main/t/flush-innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush.test b/storage/eloq/mysql-test/eloq_main/t/flush.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush.test rename to storage/eloq/mysql-test/eloq_main/t/flush.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush2-master.opt b/storage/eloq/mysql-test/eloq_main/t/flush2-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush2-master.opt rename to storage/eloq/mysql-test/eloq_main/t/flush2-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/flush2.test b/storage/eloq/mysql-test/eloq_main/t/flush2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush2.test rename to storage/eloq/mysql-test/eloq_main/t/flush2.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush_and_binlog.test b/storage/eloq/mysql-test/eloq_main/t/flush_and_binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush_and_binlog.test rename to storage/eloq/mysql-test/eloq_main/t/flush_and_binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush_block_commit.test b/storage/eloq/mysql-test/eloq_main/t/flush_block_commit.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush_block_commit.test rename to storage/eloq/mysql-test/eloq_main/t/flush_block_commit.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush_block_commit_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/flush_block_commit_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush_block_commit_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/flush_block_commit_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush_logs_not_windows.test b/storage/eloq/mysql-test/eloq_main/t/flush_logs_not_windows.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush_logs_not_windows.test rename to storage/eloq/mysql-test/eloq_main/t/flush_logs_not_windows.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/flush_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/flush_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush_read_lock.test b/storage/eloq/mysql-test/eloq_main/t/flush_read_lock.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush_read_lock.test rename to storage/eloq/mysql-test/eloq_main/t/flush_read_lock.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush_read_lock_kill.test b/storage/eloq/mysql-test/eloq_main/t/flush_read_lock_kill.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush_read_lock_kill.test rename to storage/eloq/mysql-test/eloq_main/t/flush_read_lock_kill.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush_ssl.test b/storage/eloq/mysql-test/eloq_main/t/flush_ssl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush_ssl.test rename to storage/eloq/mysql-test/eloq_main/t/flush_ssl.test diff --git a/storage/eloq/mysql-test/mono_main/t/flush_table.test b/storage/eloq/mysql-test/eloq_main/t/flush_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/flush_table.test rename to storage/eloq/mysql-test/eloq_main/t/flush_table.test diff --git a/storage/eloq/mysql-test/mono_main/t/foreign_key.test b/storage/eloq/mysql-test/eloq_main/t/foreign_key.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/foreign_key.test rename to storage/eloq/mysql-test/eloq_main/t/foreign_key.test diff --git a/storage/eloq/mysql-test/mono_main/t/frm-debug.test b/storage/eloq/mysql-test/eloq_main/t/frm-debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/frm-debug.test rename to storage/eloq/mysql-test/eloq_main/t/frm-debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/frm_bad_row_type-7333.test b/storage/eloq/mysql-test/eloq_main/t/frm_bad_row_type-7333.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/frm_bad_row_type-7333.test rename to storage/eloq/mysql-test/eloq_main/t/frm_bad_row_type-7333.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext.test b/storage/eloq/mysql-test/eloq_main/t/fulltext.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext2.test b/storage/eloq/mysql-test/eloq_main/t/fulltext2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext2.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext2.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext3.test b/storage/eloq/mysql-test/eloq_main/t/fulltext3.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext3.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext3.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext_cache.test b/storage/eloq/mysql-test/eloq_main/t/fulltext_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext_cache.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext_cache.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext_charsets.test b/storage/eloq/mysql-test/eloq_main/t/fulltext_charsets.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext_charsets.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext_charsets.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext_derived_4257.test b/storage/eloq/mysql-test/eloq_main/t/fulltext_derived_4257.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext_derived_4257.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext_derived_4257.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext_derived_4316.test b/storage/eloq/mysql-test/eloq_main/t/fulltext_derived_4316.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext_derived_4316.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext_derived_4316.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext_distinct.test b/storage/eloq/mysql-test/eloq_main/t/fulltext_distinct.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext_distinct.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext_distinct.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext_left_join.test b/storage/eloq/mysql-test/eloq_main/t/fulltext_left_join.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext_left_join.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext_left_join.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext_multi.test b/storage/eloq/mysql-test/eloq_main/t/fulltext_multi.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext_multi.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext_multi.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext_order_by.test b/storage/eloq/mysql-test/eloq_main/t/fulltext_order_by.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext_order_by.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext_order_by.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext_update.test b/storage/eloq/mysql-test/eloq_main/t/fulltext_update.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext_update.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext_update.test diff --git a/storage/eloq/mysql-test/mono_main/t/fulltext_var.test b/storage/eloq/mysql-test/eloq_main/t/fulltext_var.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/fulltext_var.test rename to storage/eloq/mysql-test/eloq_main/t/fulltext_var.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_analyse.test b/storage/eloq/mysql-test/eloq_main/t/func_analyse.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_analyse.test rename to storage/eloq/mysql-test/eloq_main/t/func_analyse.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_bit.test b/storage/eloq/mysql-test/eloq_main/t/func_bit.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_bit.test rename to storage/eloq/mysql-test/eloq_main/t/func_bit.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_compress.test b/storage/eloq/mysql-test/eloq_main/t/func_compress.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_compress.test rename to storage/eloq/mysql-test/eloq_main/t/func_compress.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_concat.test b/storage/eloq/mysql-test/eloq_main/t/func_concat.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_concat.test rename to storage/eloq/mysql-test/eloq_main/t/func_concat.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_crypt.test b/storage/eloq/mysql-test/eloq_main/t/func_crypt.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_crypt.test rename to storage/eloq/mysql-test/eloq_main/t/func_crypt.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_date_add.test b/storage/eloq/mysql-test/eloq_main/t/func_date_add.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_date_add.test rename to storage/eloq/mysql-test/eloq_main/t/func_date_add.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_debug.test b/storage/eloq/mysql-test/eloq_main/t/func_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_debug.test rename to storage/eloq/mysql-test/eloq_main/t/func_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_default.test b/storage/eloq/mysql-test/eloq_main/t/func_default.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_default.test rename to storage/eloq/mysql-test/eloq_main/t/func_default.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_des_encrypt.test b/storage/eloq/mysql-test/eloq_main/t/func_des_encrypt.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_des_encrypt.test rename to storage/eloq/mysql-test/eloq_main/t/func_des_encrypt.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_digest.test b/storage/eloq/mysql-test/eloq_main/t/func_digest.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_digest.test rename to storage/eloq/mysql-test/eloq_main/t/func_digest.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_encrypt-master.opt b/storage/eloq/mysql-test/eloq_main/t/func_encrypt-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_encrypt-master.opt rename to storage/eloq/mysql-test/eloq_main/t/func_encrypt-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/func_encrypt.test b/storage/eloq/mysql-test/eloq_main/t/func_encrypt.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_encrypt.test rename to storage/eloq/mysql-test/eloq_main/t/func_encrypt.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_encrypt_nossl.test b/storage/eloq/mysql-test/eloq_main/t/func_encrypt_nossl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_encrypt_nossl.test rename to storage/eloq/mysql-test/eloq_main/t/func_encrypt_nossl.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_encrypt_ucs2.test b/storage/eloq/mysql-test/eloq_main/t/func_encrypt_ucs2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_encrypt_ucs2.test rename to storage/eloq/mysql-test/eloq_main/t/func_encrypt_ucs2.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_equal.test b/storage/eloq/mysql-test/eloq_main/t/func_equal.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_equal.test rename to storage/eloq/mysql-test/eloq_main/t/func_equal.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_extract.test b/storage/eloq/mysql-test/eloq_main/t/func_extract.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_extract.test rename to storage/eloq/mysql-test/eloq_main/t/func_extract.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_gconcat.test b/storage/eloq/mysql-test/eloq_main/t/func_gconcat.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_gconcat.test rename to storage/eloq/mysql-test/eloq_main/t/func_gconcat.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_group.test b/storage/eloq/mysql-test/eloq_main/t/func_group.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_group.test rename to storage/eloq/mysql-test/eloq_main/t/func_group.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_group_innodb.test b/storage/eloq/mysql-test/eloq_main/t/func_group_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_group_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/func_group_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_hybrid_type.test b/storage/eloq/mysql-test/eloq_main/t/func_hybrid_type.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_hybrid_type.test rename to storage/eloq/mysql-test/eloq_main/t/func_hybrid_type.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_if.test b/storage/eloq/mysql-test/eloq_main/t/func_if.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_if.test rename to storage/eloq/mysql-test/eloq_main/t/func_if.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_in.test b/storage/eloq/mysql-test/eloq_main/t/func_in.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_in.test rename to storage/eloq/mysql-test/eloq_main/t/func_in.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_int.test b/storage/eloq/mysql-test/eloq_main/t/func_int.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_int.test rename to storage/eloq/mysql-test/eloq_main/t/func_int.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_isnull.test b/storage/eloq/mysql-test/eloq_main/t/func_isnull.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_isnull.test rename to storage/eloq/mysql-test/eloq_main/t/func_isnull.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_json.test b/storage/eloq/mysql-test/eloq_main/t/func_json.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_json.test rename to storage/eloq/mysql-test/eloq_main/t/func_json.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_like.test b/storage/eloq/mysql-test/eloq_main/t/func_like.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_like.test rename to storage/eloq/mysql-test/eloq_main/t/func_like.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_math.test b/storage/eloq/mysql-test/eloq_main/t/func_math.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_math.test rename to storage/eloq/mysql-test/eloq_main/t/func_math.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_misc.test b/storage/eloq/mysql-test/eloq_main/t/func_misc.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_misc.test rename to storage/eloq/mysql-test/eloq_main/t/func_misc.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_op.test b/storage/eloq/mysql-test/eloq_main/t/func_op.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_op.test rename to storage/eloq/mysql-test/eloq_main/t/func_op.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_regexp.test b/storage/eloq/mysql-test/eloq_main/t/func_regexp.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_regexp.test rename to storage/eloq/mysql-test/eloq_main/t/func_regexp.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_regexp_pcre.test b/storage/eloq/mysql-test/eloq_main/t/func_regexp_pcre.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_regexp_pcre.test rename to storage/eloq/mysql-test/eloq_main/t/func_regexp_pcre.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_regexp_pcre_debug.test b/storage/eloq/mysql-test/eloq_main/t/func_regexp_pcre_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_regexp_pcre_debug.test rename to storage/eloq/mysql-test/eloq_main/t/func_regexp_pcre_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_rollback.test b/storage/eloq/mysql-test/eloq_main/t/func_rollback.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_rollback.test rename to storage/eloq/mysql-test/eloq_main/t/func_rollback.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_sapdb.test b/storage/eloq/mysql-test/eloq_main/t/func_sapdb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_sapdb.test rename to storage/eloq/mysql-test/eloq_main/t/func_sapdb.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_set.test b/storage/eloq/mysql-test/eloq_main/t/func_set.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_set.test rename to storage/eloq/mysql-test/eloq_main/t/func_set.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_str.test b/storage/eloq/mysql-test/eloq_main/t/func_str.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_str.test rename to storage/eloq/mysql-test/eloq_main/t/func_str.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_system.test b/storage/eloq/mysql-test/eloq_main/t/func_system.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_system.test rename to storage/eloq/mysql-test/eloq_main/t/func_system.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_test.test b/storage/eloq/mysql-test/eloq_main/t/func_test.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_test.test rename to storage/eloq/mysql-test/eloq_main/t/func_test.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_time.test b/storage/eloq/mysql-test/eloq_main/t/func_time.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_time.test rename to storage/eloq/mysql-test/eloq_main/t/func_time.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_time_hires.test b/storage/eloq/mysql-test/eloq_main/t/func_time_hires.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_time_hires.test rename to storage/eloq/mysql-test/eloq_main/t/func_time_hires.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_time_round.test b/storage/eloq/mysql-test/eloq_main/t/func_time_round.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_time_round.test rename to storage/eloq/mysql-test/eloq_main/t/func_time_round.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_timestamp.test b/storage/eloq/mysql-test/eloq_main/t/func_timestamp.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_timestamp.test rename to storage/eloq/mysql-test/eloq_main/t/func_timestamp.test diff --git a/storage/eloq/mysql-test/mono_main/t/func_weight_string.test b/storage/eloq/mysql-test/eloq_main/t/func_weight_string.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/func_weight_string.test rename to storage/eloq/mysql-test/eloq_main/t/func_weight_string.test diff --git a/storage/eloq/mysql-test/mono_main/t/function_defaults.test b/storage/eloq/mysql-test/eloq_main/t/function_defaults.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/function_defaults.test rename to storage/eloq/mysql-test/eloq_main/t/function_defaults.test diff --git a/storage/eloq/mysql-test/mono_main/t/function_defaults_innodb.test b/storage/eloq/mysql-test/eloq_main/t/function_defaults_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/function_defaults_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/function_defaults_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/function_defaults_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/function_defaults_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/function_defaults_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/function_defaults_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/gcc296.test b/storage/eloq/mysql-test/eloq_main/t/gcc296.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/gcc296.test rename to storage/eloq/mysql-test/eloq_main/t/gcc296.test diff --git a/storage/eloq/mysql-test/mono_main/t/get_diagnostics.test b/storage/eloq/mysql-test/eloq_main/t/get_diagnostics.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/get_diagnostics.test rename to storage/eloq/mysql-test/eloq_main/t/get_diagnostics.test diff --git a/storage/eloq/mysql-test/mono_main/t/gis-alter_table_online.test b/storage/eloq/mysql-test/eloq_main/t/gis-alter_table_online.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/gis-alter_table_online.test rename to storage/eloq/mysql-test/eloq_main/t/gis-alter_table_online.test diff --git a/storage/eloq/mysql-test/mono_main/t/gis-debug.test b/storage/eloq/mysql-test/eloq_main/t/gis-debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/gis-debug.test rename to storage/eloq/mysql-test/eloq_main/t/gis-debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/gis-json.test b/storage/eloq/mysql-test/eloq_main/t/gis-json.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/gis-json.test rename to storage/eloq/mysql-test/eloq_main/t/gis-json.test diff --git a/storage/eloq/mysql-test/mono_main/t/gis-loaddata.test b/storage/eloq/mysql-test/eloq_main/t/gis-loaddata.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/gis-loaddata.test rename to storage/eloq/mysql-test/eloq_main/t/gis-loaddata.test diff --git a/storage/eloq/mysql-test/mono_main/t/gis-precise.test b/storage/eloq/mysql-test/eloq_main/t/gis-precise.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/gis-precise.test rename to storage/eloq/mysql-test/eloq_main/t/gis-precise.test diff --git a/storage/eloq/mysql-test/mono_main/t/gis-rt-precise.test b/storage/eloq/mysql-test/eloq_main/t/gis-rt-precise.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/gis-rt-precise.test rename to storage/eloq/mysql-test/eloq_main/t/gis-rt-precise.test diff --git a/storage/eloq/mysql-test/mono_main/t/gis-rtree.test b/storage/eloq/mysql-test/eloq_main/t/gis-rtree.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/gis-rtree.test rename to storage/eloq/mysql-test/eloq_main/t/gis-rtree.test diff --git a/storage/eloq/mysql-test/mono_main/t/gis.test b/storage/eloq/mysql-test/eloq_main/t/gis.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/gis.test rename to storage/eloq/mysql-test/eloq_main/t/gis.test diff --git a/storage/eloq/mysql-test/mono_main/t/gis_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/gis_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/gis_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/gis_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant.opt b/storage/eloq/mysql-test/eloq_main/t/grant.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant.opt rename to storage/eloq/mysql-test/eloq_main/t/grant.opt diff --git a/storage/eloq/mysql-test/mono_main/t/grant.test b/storage/eloq/mysql-test/eloq_main/t/grant.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant.test rename to storage/eloq/mysql-test/eloq_main/t/grant.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant2.opt b/storage/eloq/mysql-test/eloq_main/t/grant2.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant2.opt rename to storage/eloq/mysql-test/eloq_main/t/grant2.opt diff --git a/storage/eloq/mysql-test/mono_main/t/grant2.test b/storage/eloq/mysql-test/eloq_main/t/grant2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant2.test rename to storage/eloq/mysql-test/eloq_main/t/grant2.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant3-master.opt b/storage/eloq/mysql-test/eloq_main/t/grant3-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant3-master.opt rename to storage/eloq/mysql-test/eloq_main/t/grant3-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/grant3.test b/storage/eloq/mysql-test/eloq_main/t/grant3.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant3.test rename to storage/eloq/mysql-test/eloq_main/t/grant3.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant4.opt b/storage/eloq/mysql-test/eloq_main/t/grant4.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant4.opt rename to storage/eloq/mysql-test/eloq_main/t/grant4.opt diff --git a/storage/eloq/mysql-test/mono_main/t/grant4.test b/storage/eloq/mysql-test/eloq_main/t/grant4.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant4.test rename to storage/eloq/mysql-test/eloq_main/t/grant4.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant5.test b/storage/eloq/mysql-test/eloq_main/t/grant5.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant5.test rename to storage/eloq/mysql-test/eloq_main/t/grant5.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_4332.test b/storage/eloq/mysql-test/eloq_main/t/grant_4332.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_4332.test rename to storage/eloq/mysql-test/eloq_main/t/grant_4332.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_binlog_replay.test b/storage/eloq/mysql-test/eloq_main/t/grant_binlog_replay.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_binlog_replay.test rename to storage/eloq/mysql-test/eloq_main/t/grant_binlog_replay.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_cache_no_prot.test b/storage/eloq/mysql-test/eloq_main/t/grant_cache_no_prot.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_cache_no_prot.test rename to storage/eloq/mysql-test/eloq_main/t/grant_cache_no_prot.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_cache_ps_prot.test b/storage/eloq/mysql-test/eloq_main/t/grant_cache_ps_prot.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_cache_ps_prot.test rename to storage/eloq/mysql-test/eloq_main/t/grant_cache_ps_prot.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_explain_non_select.test b/storage/eloq/mysql-test/eloq_main/t/grant_explain_non_select.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_explain_non_select.test rename to storage/eloq/mysql-test/eloq_main/t/grant_explain_non_select.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_kill.test b/storage/eloq/mysql-test/eloq_main/t/grant_kill.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_kill.test rename to storage/eloq/mysql-test/eloq_main/t/grant_kill.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_lowercase.opt b/storage/eloq/mysql-test/eloq_main/t/grant_lowercase.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_lowercase.opt rename to storage/eloq/mysql-test/eloq_main/t/grant_lowercase.opt diff --git a/storage/eloq/mysql-test/mono_main/t/grant_lowercase.test b/storage/eloq/mysql-test/eloq_main/t/grant_lowercase.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_lowercase.test rename to storage/eloq/mysql-test/eloq_main/t/grant_lowercase.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_lowercase_fs.test b/storage/eloq/mysql-test/eloq_main/t/grant_lowercase_fs.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_lowercase_fs.test rename to storage/eloq/mysql-test/eloq_main/t/grant_lowercase_fs.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_master_admin.test b/storage/eloq/mysql-test/eloq_main/t/grant_master_admin.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_master_admin.test rename to storage/eloq/mysql-test/eloq_main/t/grant_master_admin.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_not_windows.test b/storage/eloq/mysql-test/eloq_main/t/grant_not_windows.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_not_windows.test rename to storage/eloq/mysql-test/eloq_main/t/grant_not_windows.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_read_only.test b/storage/eloq/mysql-test/eloq_main/t/grant_read_only.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_read_only.test rename to storage/eloq/mysql-test/eloq_main/t/grant_read_only.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_repair.test b/storage/eloq/mysql-test/eloq_main/t/grant_repair.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_repair.test rename to storage/eloq/mysql-test/eloq_main/t/grant_repair.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_server.test b/storage/eloq/mysql-test/eloq_main/t/grant_server.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_server.test rename to storage/eloq/mysql-test/eloq_main/t/grant_server.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_slave_admin.test b/storage/eloq/mysql-test/eloq_main/t/grant_slave_admin.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_slave_admin.test rename to storage/eloq/mysql-test/eloq_main/t/grant_slave_admin.test diff --git a/storage/eloq/mysql-test/mono_main/t/grant_slave_monitor.test b/storage/eloq/mysql-test/eloq_main/t/grant_slave_monitor.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/grant_slave_monitor.test rename to storage/eloq/mysql-test/eloq_main/t/grant_slave_monitor.test diff --git a/storage/eloq/mysql-test/mono_main/t/greedy_optimizer.test b/storage/eloq/mysql-test/eloq_main/t/greedy_optimizer.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/greedy_optimizer.test rename to storage/eloq/mysql-test/eloq_main/t/greedy_optimizer.test diff --git a/storage/eloq/mysql-test/mono_main/t/group_by.test b/storage/eloq/mysql-test/eloq_main/t/group_by.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/group_by.test rename to storage/eloq/mysql-test/eloq_main/t/group_by.test diff --git a/storage/eloq/mysql-test/mono_main/t/group_by_innodb.test b/storage/eloq/mysql-test/eloq_main/t/group_by_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/group_by_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/group_by_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/group_by_null.test b/storage/eloq/mysql-test/eloq_main/t/group_by_null.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/group_by_null.test rename to storage/eloq/mysql-test/eloq_main/t/group_by_null.test diff --git a/storage/eloq/mysql-test/mono_main/t/group_min_max.test b/storage/eloq/mysql-test/eloq_main/t/group_min_max.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/group_min_max.test rename to storage/eloq/mysql-test/eloq_main/t/group_min_max.test diff --git a/storage/eloq/mysql-test/mono_main/t/group_min_max_innodb.test b/storage/eloq/mysql-test/eloq_main/t/group_min_max_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/group_min_max_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/group_min_max_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/handler_read_last.test b/storage/eloq/mysql-test/eloq_main/t/handler_read_last.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/handler_read_last.test rename to storage/eloq/mysql-test/eloq_main/t/handler_read_last.test diff --git a/storage/eloq/mysql-test/mono_main/t/handlersocket.opt b/storage/eloq/mysql-test/eloq_main/t/handlersocket.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/handlersocket.opt rename to storage/eloq/mysql-test/eloq_main/t/handlersocket.opt diff --git a/storage/eloq/mysql-test/mono_main/t/handlersocket.test b/storage/eloq/mysql-test/eloq_main/t/handlersocket.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/handlersocket.test rename to storage/eloq/mysql-test/eloq_main/t/handlersocket.test diff --git a/storage/eloq/mysql-test/mono_main/t/having.test b/storage/eloq/mysql-test/eloq_main/t/having.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/having.test rename to storage/eloq/mysql-test/eloq_main/t/having.test diff --git a/storage/eloq/mysql-test/mono_main/t/having_cond_pushdown.test b/storage/eloq/mysql-test/eloq_main/t/having_cond_pushdown.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/having_cond_pushdown.test rename to storage/eloq/mysql-test/eloq_main/t/having_cond_pushdown.test diff --git a/storage/eloq/mysql-test/mono_main/t/help.test b/storage/eloq/mysql-test/eloq_main/t/help.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/help.test rename to storage/eloq/mysql-test/eloq_main/t/help.test diff --git a/storage/eloq/mysql-test/mono_main/t/host_cache_size_functionality.test b/storage/eloq/mysql-test/eloq_main/t/host_cache_size_functionality.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/host_cache_size_functionality.test rename to storage/eloq/mysql-test/eloq_main/t/host_cache_size_functionality.test diff --git a/storage/eloq/mysql-test/mono_main/t/huge_frm-6224.test b/storage/eloq/mysql-test/eloq_main/t/huge_frm-6224.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/huge_frm-6224.test rename to storage/eloq/mysql-test/eloq_main/t/huge_frm-6224.test diff --git a/storage/eloq/mysql-test/mono_main/t/ignored_index.test b/storage/eloq/mysql-test/eloq_main/t/ignored_index.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ignored_index.test rename to storage/eloq/mysql-test/eloq_main/t/ignored_index.test diff --git a/storage/eloq/mysql-test/mono_main/t/ignored_index_innodb.test b/storage/eloq/mysql-test/eloq_main/t/ignored_index_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ignored_index_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/ignored_index_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/implicit_char_to_num_conversion.test b/storage/eloq/mysql-test/eloq_main/t/implicit_char_to_num_conversion.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/implicit_char_to_num_conversion.test rename to storage/eloq/mysql-test/eloq_main/t/implicit_char_to_num_conversion.test diff --git a/storage/eloq/mysql-test/mono_main/t/implicit_commit-master.opt b/storage/eloq/mysql-test/eloq_main/t/implicit_commit-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/implicit_commit-master.opt rename to storage/eloq/mysql-test/eloq_main/t/implicit_commit-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/implicit_commit.test b/storage/eloq/mysql-test/eloq_main/t/implicit_commit.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/implicit_commit.test rename to storage/eloq/mysql-test/eloq_main/t/implicit_commit.test diff --git a/storage/eloq/mysql-test/mono_main/t/in_datetime_241.test b/storage/eloq/mysql-test/eloq_main/t/in_datetime_241.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/in_datetime_241.test rename to storage/eloq/mysql-test/eloq_main/t/in_datetime_241.test diff --git a/storage/eloq/mysql-test/mono_main/t/in_subq_cond_pushdown.test b/storage/eloq/mysql-test/eloq_main/t/in_subq_cond_pushdown.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/in_subq_cond_pushdown.test rename to storage/eloq/mysql-test/eloq_main/t/in_subq_cond_pushdown.test diff --git a/storage/eloq/mysql-test/mono_main/t/index_intersect.test b/storage/eloq/mysql-test/eloq_main/t/index_intersect.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/index_intersect.test rename to storage/eloq/mysql-test/eloq_main/t/index_intersect.test diff --git a/storage/eloq/mysql-test/mono_main/t/index_intersect_innodb.test b/storage/eloq/mysql-test/eloq_main/t/index_intersect_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/index_intersect_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/index_intersect_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/index_merge_innodb.test b/storage/eloq/mysql-test/eloq_main/t/index_merge_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/index_merge_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/index_merge_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/index_merge_myisam.test b/storage/eloq/mysql-test/eloq_main/t/index_merge_myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/index_merge_myisam.test rename to storage/eloq/mysql-test/eloq_main/t/index_merge_myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema-big.test b/storage/eloq/mysql-test/eloq_main/t/information_schema-big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema-big.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema-big.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema.test b/storage/eloq/mysql-test/eloq_main/t/information_schema.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema2.test b/storage/eloq/mysql-test/eloq_main/t/information_schema2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema2.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema2.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema_all_engines-master.opt b/storage/eloq/mysql-test/eloq_main/t/information_schema_all_engines-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema_all_engines-master.opt rename to storage/eloq/mysql-test/eloq_main/t/information_schema_all_engines-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema_all_engines.test b/storage/eloq/mysql-test/eloq_main/t/information_schema_all_engines.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema_all_engines.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema_all_engines.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema_chmod.test b/storage/eloq/mysql-test/eloq_main/t/information_schema_chmod.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema_chmod.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema_chmod.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema_db.test b/storage/eloq/mysql-test/eloq_main/t/information_schema_db.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema_db.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema_db.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema_inno.test b/storage/eloq/mysql-test/eloq_main/t/information_schema_inno.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema_inno.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema_inno.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema_linux.test b/storage/eloq/mysql-test/eloq_main/t/information_schema_linux.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema_linux.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema_linux.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema_parameters.test b/storage/eloq/mysql-test/eloq_main/t/information_schema_parameters.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema_parameters.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema_parameters.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema_part.test b/storage/eloq/mysql-test/eloq_main/t/information_schema_part.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema_part.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema_part.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema_prepare.test b/storage/eloq/mysql-test/eloq_main/t/information_schema_prepare.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema_prepare.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema_prepare.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema_routines.test b/storage/eloq/mysql-test/eloq_main/t/information_schema_routines.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema_routines.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema_routines.test diff --git a/storage/eloq/mysql-test/mono_main/t/information_schema_stats.test b/storage/eloq/mysql-test/eloq_main/t/information_schema_stats.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/information_schema_stats.test rename to storage/eloq/mysql-test/eloq_main/t/information_schema_stats.test diff --git a/storage/eloq/mysql-test/mono_main/t/init_connect-master.opt b/storage/eloq/mysql-test/eloq_main/t/init_connect-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/init_connect-master.opt rename to storage/eloq/mysql-test/eloq_main/t/init_connect-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/init_connect.test b/storage/eloq/mysql-test/eloq_main/t/init_connect.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/init_connect.test rename to storage/eloq/mysql-test/eloq_main/t/init_connect.test diff --git a/storage/eloq/mysql-test/mono_main/t/init_connection_query_cache-master.opt b/storage/eloq/mysql-test/eloq_main/t/init_connection_query_cache-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/init_connection_query_cache-master.opt rename to storage/eloq/mysql-test/eloq_main/t/init_connection_query_cache-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/init_connection_query_cache.test b/storage/eloq/mysql-test/eloq_main/t/init_connection_query_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/init_connection_query_cache.test rename to storage/eloq/mysql-test/eloq_main/t/init_connection_query_cache.test diff --git a/storage/eloq/mysql-test/mono_main/t/init_file.opt b/storage/eloq/mysql-test/eloq_main/t/init_file.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/init_file.opt rename to storage/eloq/mysql-test/eloq_main/t/init_file.opt diff --git a/storage/eloq/mysql-test/mono_main/t/init_file.test b/storage/eloq/mysql-test/eloq_main/t/init_file.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/init_file.test rename to storage/eloq/mysql-test/eloq_main/t/init_file.test diff --git a/storage/eloq/mysql-test/mono_main/t/init_file_longline_3816.opt b/storage/eloq/mysql-test/eloq_main/t/init_file_longline_3816.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/init_file_longline_3816.opt rename to storage/eloq/mysql-test/eloq_main/t/init_file_longline_3816.opt diff --git a/storage/eloq/mysql-test/mono_main/t/init_file_longline_3816.test b/storage/eloq/mysql-test/eloq_main/t/init_file_longline_3816.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/init_file_longline_3816.test rename to storage/eloq/mysql-test/eloq_main/t/init_file_longline_3816.test diff --git a/storage/eloq/mysql-test/mono_main/t/init_file_set_password-7656.test b/storage/eloq/mysql-test/eloq_main/t/init_file_set_password-7656.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/init_file_set_password-7656.test rename to storage/eloq/mysql-test/eloq_main/t/init_file_set_password-7656.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_bug878769.test b/storage/eloq/mysql-test/eloq_main/t/innodb_bug878769.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_bug878769.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_bug878769.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_ext_key.combinations b/storage/eloq/mysql-test/eloq_main/t/innodb_ext_key.combinations similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_ext_key.combinations rename to storage/eloq/mysql-test/eloq_main/t/innodb_ext_key.combinations diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_ext_key.test b/storage/eloq/mysql-test/eloq_main/t/innodb_ext_key.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_ext_key.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_ext_key.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_group.test b/storage/eloq/mysql-test/eloq_main/t/innodb_group.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_group.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_group.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_icp.test b/storage/eloq/mysql-test/eloq_main/t/innodb_icp.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_icp.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_icp.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_icp_debug.test b/storage/eloq/mysql-test/eloq_main/t/innodb_icp_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_icp_debug.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_icp_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_ignore_builtin-master.opt b/storage/eloq/mysql-test/eloq_main/t/innodb_ignore_builtin-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_ignore_builtin-master.opt rename to storage/eloq/mysql-test/eloq_main/t/innodb_ignore_builtin-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_ignore_builtin.test b/storage/eloq/mysql-test/eloq_main/t/innodb_ignore_builtin.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_ignore_builtin.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_ignore_builtin.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_load_xa.opt b/storage/eloq/mysql-test/eloq_main/t/innodb_load_xa.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_load_xa.opt rename to storage/eloq/mysql-test/eloq_main/t/innodb_load_xa.opt diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_load_xa.test b/storage/eloq/mysql-test/eloq_main/t/innodb_load_xa.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_load_xa.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_load_xa.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_mrr_cpk.test b/storage/eloq/mysql-test/eloq_main/t/innodb_mrr_cpk.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_mrr_cpk.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_mrr_cpk.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_mysql_lock.test b/storage/eloq/mysql-test/eloq_main/t/innodb_mysql_lock.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_mysql_lock.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_mysql_lock.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_mysql_lock2.test b/storage/eloq/mysql-test/eloq_main/t/innodb_mysql_lock2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_mysql_lock2.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_mysql_lock2.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_mysql_sync.test b/storage/eloq/mysql-test/eloq_main/t/innodb_mysql_sync.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_mysql_sync.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_mysql_sync.test diff --git a/storage/eloq/mysql-test/mono_main/t/innodb_utf8.test b/storage/eloq/mysql-test/eloq_main/t/innodb_utf8.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/innodb_utf8.test rename to storage/eloq/mysql-test/eloq_main/t/innodb_utf8.test diff --git a/storage/eloq/mysql-test/mono_main/t/insert.test b/storage/eloq/mysql-test/eloq_main/t/insert.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/insert.test rename to storage/eloq/mysql-test/eloq_main/t/insert.test diff --git a/storage/eloq/mysql-test/mono_main/t/insert_debug-master.opt b/storage/eloq/mysql-test/eloq_main/t/insert_debug-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/insert_debug-master.opt rename to storage/eloq/mysql-test/eloq_main/t/insert_debug-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/insert_debug.test b/storage/eloq/mysql-test/eloq_main/t/insert_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/insert_debug.test rename to storage/eloq/mysql-test/eloq_main/t/insert_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/insert_innodb.test b/storage/eloq/mysql-test/eloq_main/t/insert_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/insert_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/insert_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/insert_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/insert_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/insert_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/insert_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/insert_returning.test b/storage/eloq/mysql-test/eloq_main/t/insert_returning.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/insert_returning.test rename to storage/eloq/mysql-test/eloq_main/t/insert_returning.test diff --git a/storage/eloq/mysql-test/mono_main/t/insert_returning_datatypes.test b/storage/eloq/mysql-test/eloq_main/t/insert_returning_datatypes.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/insert_returning_datatypes.test rename to storage/eloq/mysql-test/eloq_main/t/insert_returning_datatypes.test diff --git a/storage/eloq/mysql-test/mono_main/t/insert_select.test b/storage/eloq/mysql-test/eloq_main/t/insert_select.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/insert_select.test rename to storage/eloq/mysql-test/eloq_main/t/insert_select.test diff --git a/storage/eloq/mysql-test/mono_main/t/insert_update.test b/storage/eloq/mysql-test/eloq_main/t/insert_update.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/insert_update.test rename to storage/eloq/mysql-test/eloq_main/t/insert_update.test diff --git a/storage/eloq/mysql-test/mono_main/t/insert_update_autoinc-7150.test b/storage/eloq/mysql-test/eloq_main/t/insert_update_autoinc-7150.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/insert_update_autoinc-7150.test rename to storage/eloq/mysql-test/eloq_main/t/insert_update_autoinc-7150.test diff --git a/storage/eloq/mysql-test/mono_main/t/intersect.test b/storage/eloq/mysql-test/eloq_main/t/intersect.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/intersect.test rename to storage/eloq/mysql-test/eloq_main/t/intersect.test diff --git a/storage/eloq/mysql-test/mono_main/t/intersect_all.test b/storage/eloq/mysql-test/eloq_main/t/intersect_all.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/intersect_all.test rename to storage/eloq/mysql-test/eloq_main/t/intersect_all.test diff --git a/storage/eloq/mysql-test/mono_main/t/invisible_binlog.test b/storage/eloq/mysql-test/eloq_main/t/invisible_binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/invisible_binlog.test rename to storage/eloq/mysql-test/eloq_main/t/invisible_binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/invisible_field.test b/storage/eloq/mysql-test/eloq_main/t/invisible_field.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/invisible_field.test rename to storage/eloq/mysql-test/eloq_main/t/invisible_field.test diff --git a/storage/eloq/mysql-test/mono_main/t/invisible_field_debug.test b/storage/eloq/mysql-test/eloq_main/t/invisible_field_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/invisible_field_debug.test rename to storage/eloq/mysql-test/eloq_main/t/invisible_field_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/invisible_field_grant_completely.test b/storage/eloq/mysql-test/eloq_main/t/invisible_field_grant_completely.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/invisible_field_grant_completely.test rename to storage/eloq/mysql-test/eloq_main/t/invisible_field_grant_completely.test diff --git a/storage/eloq/mysql-test/mono_main/t/invisible_field_grant_system.test b/storage/eloq/mysql-test/eloq_main/t/invisible_field_grant_system.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/invisible_field_grant_system.test rename to storage/eloq/mysql-test/eloq_main/t/invisible_field_grant_system.test diff --git a/storage/eloq/mysql-test/mono_main/t/invisible_partition.test b/storage/eloq/mysql-test/eloq_main/t/invisible_partition.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/invisible_partition.test rename to storage/eloq/mysql-test/eloq_main/t/invisible_partition.test diff --git a/storage/eloq/mysql-test/mono_main/t/ipv4_and_ipv6.opt b/storage/eloq/mysql-test/eloq_main/t/ipv4_and_ipv6.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ipv4_and_ipv6.opt rename to storage/eloq/mysql-test/eloq_main/t/ipv4_and_ipv6.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ipv4_and_ipv6.test b/storage/eloq/mysql-test/eloq_main/t/ipv4_and_ipv6.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ipv4_and_ipv6.test rename to storage/eloq/mysql-test/eloq_main/t/ipv4_and_ipv6.test diff --git a/storage/eloq/mysql-test/mono_main/t/ipv4_as_ipv6-master.opt b/storage/eloq/mysql-test/eloq_main/t/ipv4_as_ipv6-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ipv4_as_ipv6-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ipv4_as_ipv6-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ipv4_as_ipv6.test b/storage/eloq/mysql-test/eloq_main/t/ipv4_as_ipv6.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ipv4_as_ipv6.test rename to storage/eloq/mysql-test/eloq_main/t/ipv4_as_ipv6.test diff --git a/storage/eloq/mysql-test/mono_main/t/ipv6-master.opt b/storage/eloq/mysql-test/eloq_main/t/ipv6-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ipv6-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ipv6-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ipv6.test b/storage/eloq/mysql-test/eloq_main/t/ipv6.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ipv6.test rename to storage/eloq/mysql-test/eloq_main/t/ipv6.test diff --git a/storage/eloq/mysql-test/mono_main/t/join.test b/storage/eloq/mysql-test/eloq_main/t/join.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/join.test rename to storage/eloq/mysql-test/eloq_main/t/join.test diff --git a/storage/eloq/mysql-test/mono_main/t/join_cache.test b/storage/eloq/mysql-test/eloq_main/t/join_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/join_cache.test rename to storage/eloq/mysql-test/eloq_main/t/join_cache.test diff --git a/storage/eloq/mysql-test/mono_main/t/join_crash.test b/storage/eloq/mysql-test/eloq_main/t/join_crash.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/join_crash.test rename to storage/eloq/mysql-test/eloq_main/t/join_crash.test diff --git a/storage/eloq/mysql-test/mono_main/t/join_nested.test b/storage/eloq/mysql-test/eloq_main/t/join_nested.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/join_nested.test rename to storage/eloq/mysql-test/eloq_main/t/join_nested.test diff --git a/storage/eloq/mysql-test/mono_main/t/join_nested_jcl6.test b/storage/eloq/mysql-test/eloq_main/t/join_nested_jcl6.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/join_nested_jcl6.test rename to storage/eloq/mysql-test/eloq_main/t/join_nested_jcl6.test diff --git a/storage/eloq/mysql-test/mono_main/t/join_optimizer.test b/storage/eloq/mysql-test/eloq_main/t/join_optimizer.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/join_optimizer.test rename to storage/eloq/mysql-test/eloq_main/t/join_optimizer.test diff --git a/storage/eloq/mysql-test/mono_main/t/join_outer.test b/storage/eloq/mysql-test/eloq_main/t/join_outer.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/join_outer.test rename to storage/eloq/mysql-test/eloq_main/t/join_outer.test diff --git a/storage/eloq/mysql-test/mono_main/t/join_outer_innodb.test b/storage/eloq/mysql-test/eloq_main/t/join_outer_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/join_outer_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/join_outer_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/join_outer_jcl6.test b/storage/eloq/mysql-test/eloq_main/t/join_outer_jcl6.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/join_outer_jcl6.test rename to storage/eloq/mysql-test/eloq_main/t/join_outer_jcl6.test diff --git a/storage/eloq/mysql-test/mono_main/t/key.test b/storage/eloq/mysql-test/eloq_main/t/key.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/key.test rename to storage/eloq/mysql-test/eloq_main/t/key.test diff --git a/storage/eloq/mysql-test/mono_main/t/key_cache-master.opt b/storage/eloq/mysql-test/eloq_main/t/key_cache-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/key_cache-master.opt rename to storage/eloq/mysql-test/eloq_main/t/key_cache-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/key_cache.test b/storage/eloq/mysql-test/eloq_main/t/key_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/key_cache.test rename to storage/eloq/mysql-test/eloq_main/t/key_cache.test diff --git a/storage/eloq/mysql-test/mono_main/t/key_diff.test b/storage/eloq/mysql-test/eloq_main/t/key_diff.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/key_diff.test rename to storage/eloq/mysql-test/eloq_main/t/key_diff.test diff --git a/storage/eloq/mysql-test/mono_main/t/key_primary.test b/storage/eloq/mysql-test/eloq_main/t/key_primary.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/key_primary.test rename to storage/eloq/mysql-test/eloq_main/t/key_primary.test diff --git a/storage/eloq/mysql-test/mono_main/t/keyread.test b/storage/eloq/mysql-test/eloq_main/t/keyread.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/keyread.test rename to storage/eloq/mysql-test/eloq_main/t/keyread.test diff --git a/storage/eloq/mysql-test/mono_main/t/keywords.test b/storage/eloq/mysql-test/eloq_main/t/keywords.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/keywords.test rename to storage/eloq/mysql-test/eloq_main/t/keywords.test diff --git a/storage/eloq/mysql-test/mono_main/t/kill-2-master.opt b/storage/eloq/mysql-test/eloq_main/t/kill-2-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/kill-2-master.opt rename to storage/eloq/mysql-test/eloq_main/t/kill-2-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/kill-2.test b/storage/eloq/mysql-test/eloq_main/t/kill-2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/kill-2.test rename to storage/eloq/mysql-test/eloq_main/t/kill-2.test diff --git a/storage/eloq/mysql-test/mono_main/t/kill.test b/storage/eloq/mysql-test/eloq_main/t/kill.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/kill.test rename to storage/eloq/mysql-test/eloq_main/t/kill.test diff --git a/storage/eloq/mysql-test/mono_main/t/kill_processlist-6619.test b/storage/eloq/mysql-test/eloq_main/t/kill_processlist-6619.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/kill_processlist-6619.test rename to storage/eloq/mysql-test/eloq_main/t/kill_processlist-6619.test diff --git a/storage/eloq/mysql-test/mono_main/t/kill_query-6728.test b/storage/eloq/mysql-test/eloq_main/t/kill_query-6728.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/kill_query-6728.test rename to storage/eloq/mysql-test/eloq_main/t/kill_query-6728.test diff --git a/storage/eloq/mysql-test/mono_main/t/large_pages.opt b/storage/eloq/mysql-test/eloq_main/t/large_pages.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/large_pages.opt rename to storage/eloq/mysql-test/eloq_main/t/large_pages.opt diff --git a/storage/eloq/mysql-test/mono_main/t/large_pages.test b/storage/eloq/mysql-test/eloq_main/t/large_pages.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/large_pages.test rename to storage/eloq/mysql-test/eloq_main/t/large_pages.test diff --git a/storage/eloq/mysql-test/mono_main/t/last_value.test b/storage/eloq/mysql-test/eloq_main/t/last_value.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/last_value.test rename to storage/eloq/mysql-test/eloq_main/t/last_value.test diff --git a/storage/eloq/mysql-test/mono_main/t/limit.test b/storage/eloq/mysql-test/eloq_main/t/limit.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/limit.test rename to storage/eloq/mysql-test/eloq_main/t/limit.test diff --git a/storage/eloq/mysql-test/mono_main/t/limit_rows_examined.test b/storage/eloq/mysql-test/eloq_main/t/limit_rows_examined.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/limit_rows_examined.test rename to storage/eloq/mysql-test/eloq_main/t/limit_rows_examined.test diff --git a/storage/eloq/mysql-test/mono_main/t/loaddata.test b/storage/eloq/mysql-test/eloq_main/t/loaddata.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/loaddata.test rename to storage/eloq/mysql-test/eloq_main/t/loaddata.test diff --git a/storage/eloq/mysql-test/mono_main/t/loaddata_autocom_innodb.test b/storage/eloq/mysql-test/eloq_main/t/loaddata_autocom_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/loaddata_autocom_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/loaddata_autocom_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/loadxml.test b/storage/eloq/mysql-test/eloq_main/t/loadxml.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/loadxml.test rename to storage/eloq/mysql-test/eloq_main/t/loadxml.test diff --git a/storage/eloq/mysql-test/mono_main/t/locale.opt b/storage/eloq/mysql-test/eloq_main/t/locale.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/locale.opt rename to storage/eloq/mysql-test/eloq_main/t/locale.opt diff --git a/storage/eloq/mysql-test/mono_main/t/locale.test b/storage/eloq/mysql-test/eloq_main/t/locale.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/locale.test rename to storage/eloq/mysql-test/eloq_main/t/locale.test diff --git a/storage/eloq/mysql-test/mono_main/t/lock.test b/storage/eloq/mysql-test/eloq_main/t/lock.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lock.test rename to storage/eloq/mysql-test/eloq_main/t/lock.test diff --git a/storage/eloq/mysql-test/mono_main/t/lock_kill.test b/storage/eloq/mysql-test/eloq_main/t/lock_kill.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lock_kill.test rename to storage/eloq/mysql-test/eloq_main/t/lock_kill.test diff --git a/storage/eloq/mysql-test/mono_main/t/lock_multi.test b/storage/eloq/mysql-test/eloq_main/t/lock_multi.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lock_multi.test rename to storage/eloq/mysql-test/eloq_main/t/lock_multi.test diff --git a/storage/eloq/mysql-test/mono_main/t/lock_multi_bug38499.test b/storage/eloq/mysql-test/eloq_main/t/lock_multi_bug38499.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lock_multi_bug38499.test rename to storage/eloq/mysql-test/eloq_main/t/lock_multi_bug38499.test diff --git a/storage/eloq/mysql-test/mono_main/t/lock_multi_bug38691.test b/storage/eloq/mysql-test/eloq_main/t/lock_multi_bug38691.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lock_multi_bug38691.test rename to storage/eloq/mysql-test/eloq_main/t/lock_multi_bug38691.test diff --git a/storage/eloq/mysql-test/mono_main/t/lock_sync-master.opt b/storage/eloq/mysql-test/eloq_main/t/lock_sync-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lock_sync-master.opt rename to storage/eloq/mysql-test/eloq_main/t/lock_sync-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/lock_sync.test b/storage/eloq/mysql-test/eloq_main/t/lock_sync.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lock_sync.test rename to storage/eloq/mysql-test/eloq_main/t/lock_sync.test diff --git a/storage/eloq/mysql-test/mono_main/t/lock_tables_lost_commit-master.opt b/storage/eloq/mysql-test/eloq_main/t/lock_tables_lost_commit-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lock_tables_lost_commit-master.opt rename to storage/eloq/mysql-test/eloq_main/t/lock_tables_lost_commit-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/lock_tables_lost_commit.test b/storage/eloq/mysql-test/eloq_main/t/lock_tables_lost_commit.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lock_tables_lost_commit.test rename to storage/eloq/mysql-test/eloq_main/t/lock_tables_lost_commit.test diff --git a/storage/eloq/mysql-test/mono_main/t/lock_user.test b/storage/eloq/mysql-test/eloq_main/t/lock_user.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lock_user.test rename to storage/eloq/mysql-test/eloq_main/t/lock_user.test diff --git a/storage/eloq/mysql-test/mono_main/t/lock_view.test b/storage/eloq/mysql-test/eloq_main/t/lock_view.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lock_view.test rename to storage/eloq/mysql-test/eloq_main/t/lock_view.test diff --git a/storage/eloq/mysql-test/mono_main/t/locked_temporary-5955.test b/storage/eloq/mysql-test/eloq_main/t/locked_temporary-5955.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/locked_temporary-5955.test rename to storage/eloq/mysql-test/eloq_main/t/locked_temporary-5955.test diff --git a/storage/eloq/mysql-test/mono_main/t/locking_clause.test b/storage/eloq/mysql-test/eloq_main/t/locking_clause.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/locking_clause.test rename to storage/eloq/mysql-test/eloq_main/t/locking_clause.test diff --git a/storage/eloq/mysql-test/mono_main/t/log_errchk.test b/storage/eloq/mysql-test/eloq_main/t/log_errchk.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_errchk.test rename to storage/eloq/mysql-test/eloq_main/t/log_errchk.test diff --git a/storage/eloq/mysql-test/mono_main/t/log_slow.test b/storage/eloq/mysql-test/eloq_main/t/log_slow.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_slow.test rename to storage/eloq/mysql-test/eloq_main/t/log_slow.test diff --git a/storage/eloq/mysql-test/mono_main/t/log_slow_debug.test b/storage/eloq/mysql-test/eloq_main/t/log_slow_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_slow_debug.test rename to storage/eloq/mysql-test/eloq_main/t/log_slow_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/log_state-master.opt b/storage/eloq/mysql-test/eloq_main/t/log_state-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_state-master.opt rename to storage/eloq/mysql-test/eloq_main/t/log_state-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/log_state.test b/storage/eloq/mysql-test/eloq_main/t/log_state.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_state.test rename to storage/eloq/mysql-test/eloq_main/t/log_state.test diff --git a/storage/eloq/mysql-test/mono_main/t/log_state_bug33693-master.opt b/storage/eloq/mysql-test/eloq_main/t/log_state_bug33693-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_state_bug33693-master.opt rename to storage/eloq/mysql-test/eloq_main/t/log_state_bug33693-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/log_state_bug33693.test b/storage/eloq/mysql-test/eloq_main/t/log_state_bug33693.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_state_bug33693.test rename to storage/eloq/mysql-test/eloq_main/t/log_state_bug33693.test diff --git a/storage/eloq/mysql-test/mono_main/t/log_tables-big-master.opt b/storage/eloq/mysql-test/eloq_main/t/log_tables-big-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_tables-big-master.opt rename to storage/eloq/mysql-test/eloq_main/t/log_tables-big-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/log_tables-big.test b/storage/eloq/mysql-test/eloq_main/t/log_tables-big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_tables-big.test rename to storage/eloq/mysql-test/eloq_main/t/log_tables-big.test diff --git a/storage/eloq/mysql-test/mono_main/t/log_tables-master.opt b/storage/eloq/mysql-test/eloq_main/t/log_tables-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_tables-master.opt rename to storage/eloq/mysql-test/eloq_main/t/log_tables-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/log_tables.test b/storage/eloq/mysql-test/eloq_main/t/log_tables.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_tables.test rename to storage/eloq/mysql-test/eloq_main/t/log_tables.test diff --git a/storage/eloq/mysql-test/mono_main/t/log_tables_debug.test b/storage/eloq/mysql-test/eloq_main/t/log_tables_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_tables_debug.test rename to storage/eloq/mysql-test/eloq_main/t/log_tables_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/log_tables_upgrade.test b/storage/eloq/mysql-test/eloq_main/t/log_tables_upgrade.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/log_tables_upgrade.test rename to storage/eloq/mysql-test/eloq_main/t/log_tables_upgrade.test diff --git a/storage/eloq/mysql-test/mono_main/t/long_host.test b/storage/eloq/mysql-test/eloq_main/t/long_host.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_host.test rename to storage/eloq/mysql-test/eloq_main/t/long_host.test diff --git a/storage/eloq/mysql-test/mono_main/t/long_tmpdir-master.opt b/storage/eloq/mysql-test/eloq_main/t/long_tmpdir-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_tmpdir-master.opt rename to storage/eloq/mysql-test/eloq_main/t/long_tmpdir-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/long_tmpdir-master.sh b/storage/eloq/mysql-test/eloq_main/t/long_tmpdir-master.sh similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_tmpdir-master.sh rename to storage/eloq/mysql-test/eloq_main/t/long_tmpdir-master.sh diff --git a/storage/eloq/mysql-test/mono_main/t/long_tmpdir.test b/storage/eloq/mysql-test/eloq_main/t/long_tmpdir.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_tmpdir.test rename to storage/eloq/mysql-test/eloq_main/t/long_tmpdir.test diff --git a/storage/eloq/mysql-test/mono_main/t/long_unique.test b/storage/eloq/mysql-test/eloq_main/t/long_unique.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_unique.test rename to storage/eloq/mysql-test/eloq_main/t/long_unique.test diff --git a/storage/eloq/mysql-test/mono_main/t/long_unique_bugs.test b/storage/eloq/mysql-test/eloq_main/t/long_unique_bugs.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_unique_bugs.test rename to storage/eloq/mysql-test/eloq_main/t/long_unique_bugs.test diff --git a/storage/eloq/mysql-test/mono_main/t/long_unique_bugs_replication.test b/storage/eloq/mysql-test/eloq_main/t/long_unique_bugs_replication.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_unique_bugs_replication.test rename to storage/eloq/mysql-test/eloq_main/t/long_unique_bugs_replication.test diff --git a/storage/eloq/mysql-test/mono_main/t/long_unique_debug.test b/storage/eloq/mysql-test/eloq_main/t/long_unique_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_unique_debug.test rename to storage/eloq/mysql-test/eloq_main/t/long_unique_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/long_unique_delayed.test b/storage/eloq/mysql-test/eloq_main/t/long_unique_delayed.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_unique_delayed.test rename to storage/eloq/mysql-test/eloq_main/t/long_unique_delayed.test diff --git a/storage/eloq/mysql-test/mono_main/t/long_unique_innodb.opt b/storage/eloq/mysql-test/eloq_main/t/long_unique_innodb.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_unique_innodb.opt rename to storage/eloq/mysql-test/eloq_main/t/long_unique_innodb.opt diff --git a/storage/eloq/mysql-test/mono_main/t/long_unique_innodb.test b/storage/eloq/mysql-test/eloq_main/t/long_unique_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_unique_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/long_unique_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/long_unique_update.test b/storage/eloq/mysql-test/eloq_main/t/long_unique_update.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_unique_update.test rename to storage/eloq/mysql-test/eloq_main/t/long_unique_update.test diff --git a/storage/eloq/mysql-test/mono_main/t/long_unique_using_hash.test b/storage/eloq/mysql-test/eloq_main/t/long_unique_using_hash.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/long_unique_using_hash.test rename to storage/eloq/mysql-test/eloq_main/t/long_unique_using_hash.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_fs_off.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_fs_off.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_fs_off.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_fs_off.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_fs_on.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_fs_on.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_fs_on.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_fs_on.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir-master.opt b/storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir-master.opt rename to storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir-master.sh b/storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir-master.sh similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir-master.sh rename to storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir-master.sh diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir_innodb-master.opt b/storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir_innodb-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir_innodb-master.opt rename to storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir_innodb-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir_innodb-master.sh b/storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir_innodb-master.sh similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir_innodb-master.sh rename to storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir_innodb-master.sh diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir_innodb.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_mixed_tmpdir_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_mixed_tmpdir_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_table-master.opt b/storage/eloq/mysql-test/eloq_main/t/lowercase_table-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_table-master.opt rename to storage/eloq/mysql-test/eloq_main/t/lowercase_table-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_table.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_table.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_table.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_table2.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_table2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_table2.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_table2.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_table4-master.opt b/storage/eloq/mysql-test/eloq_main/t/lowercase_table4-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_table4-master.opt rename to storage/eloq/mysql-test/eloq_main/t/lowercase_table4-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_table4.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_table4.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_table4.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_table4.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_table5.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_table5.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_table5.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_table5.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_table_grant-master.opt b/storage/eloq/mysql-test/eloq_main/t/lowercase_table_grant-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_table_grant-master.opt rename to storage/eloq/mysql-test/eloq_main/t/lowercase_table_grant-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_table_grant.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_table_grant.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_table_grant.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_table_grant.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_table_qcache-master.opt b/storage/eloq/mysql-test/eloq_main/t/lowercase_table_qcache-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_table_qcache-master.opt rename to storage/eloq/mysql-test/eloq_main/t/lowercase_table_qcache-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_table_qcache.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_table_qcache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_table_qcache.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_table_qcache.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_utf8-master.opt b/storage/eloq/mysql-test/eloq_main/t/lowercase_utf8-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_utf8-master.opt rename to storage/eloq/mysql-test/eloq_main/t/lowercase_utf8-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_utf8.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_utf8.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_utf8.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_utf8.test diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_view-master.opt b/storage/eloq/mysql-test/eloq_main/t/lowercase_view-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_view-master.opt rename to storage/eloq/mysql-test/eloq_main/t/lowercase_view-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/lowercase_view.test b/storage/eloq/mysql-test/eloq_main/t/lowercase_view.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/lowercase_view.test rename to storage/eloq/mysql-test/eloq_main/t/lowercase_view.test diff --git a/storage/eloq/mysql-test/mono_main/t/max_password_errors.test b/storage/eloq/mysql-test/eloq_main/t/max_password_errors.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/max_password_errors.test rename to storage/eloq/mysql-test/eloq_main/t/max_password_errors.test diff --git a/storage/eloq/mysql-test/mono_main/t/max_statement_time.test b/storage/eloq/mysql-test/eloq_main/t/max_statement_time.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/max_statement_time.test rename to storage/eloq/mysql-test/eloq_main/t/max_statement_time.test diff --git a/storage/eloq/mysql-test/mono_main/t/mdev-21101.opt b/storage/eloq/mysql-test/eloq_main/t/mdev-21101.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdev-21101.opt rename to storage/eloq/mysql-test/eloq_main/t/mdev-21101.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mdev-21101.test b/storage/eloq/mysql-test/eloq_main/t/mdev-21101.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdev-21101.test rename to storage/eloq/mysql-test/eloq_main/t/mdev-21101.test diff --git a/storage/eloq/mysql-test/mono_main/t/mdev13607.test b/storage/eloq/mysql-test/eloq_main/t/mdev13607.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdev13607.test rename to storage/eloq/mysql-test/eloq_main/t/mdev13607.test diff --git a/storage/eloq/mysql-test/mono_main/t/mdev19198.test b/storage/eloq/mysql-test/eloq_main/t/mdev19198.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdev19198.test rename to storage/eloq/mysql-test/eloq_main/t/mdev19198.test diff --git a/storage/eloq/mysql-test/mono_main/t/mdev316.test b/storage/eloq/mysql-test/eloq_main/t/mdev316.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdev316.test rename to storage/eloq/mysql-test/eloq_main/t/mdev316.test diff --git a/storage/eloq/mysql-test/mono_main/t/mdev375.test b/storage/eloq/mysql-test/eloq_main/t/mdev375.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdev375.test rename to storage/eloq/mysql-test/eloq_main/t/mdev375.test diff --git a/storage/eloq/mysql-test/mono_main/t/mdev6830.test b/storage/eloq/mysql-test/eloq_main/t/mdev6830.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdev6830.test rename to storage/eloq/mysql-test/eloq_main/t/mdev6830.test diff --git a/storage/eloq/mysql-test/mono_main/t/mdev_14586.test b/storage/eloq/mysql-test/eloq_main/t/mdev_14586.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdev_14586.test rename to storage/eloq/mysql-test/eloq_main/t/mdev_14586.test diff --git a/storage/eloq/mysql-test/mono_main/t/mdev_19276.test b/storage/eloq/mysql-test/eloq_main/t/mdev_19276.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdev_19276.test rename to storage/eloq/mysql-test/eloq_main/t/mdev_19276.test diff --git a/storage/eloq/mysql-test/mono_main/t/mdev_22370.test b/storage/eloq/mysql-test/eloq_main/t/mdev_22370.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdev_22370.test rename to storage/eloq/mysql-test/eloq_main/t/mdev_22370.test diff --git a/storage/eloq/mysql-test/mono_main/t/mdl.test b/storage/eloq/mysql-test/eloq_main/t/mdl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdl.test rename to storage/eloq/mysql-test/eloq_main/t/mdl.test diff --git a/storage/eloq/mysql-test/mono_main/t/mdl_sync-master.opt b/storage/eloq/mysql-test/eloq_main/t/mdl_sync-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdl_sync-master.opt rename to storage/eloq/mysql-test/eloq_main/t/mdl_sync-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mdl_sync.test b/storage/eloq/mysql-test/eloq_main/t/mdl_sync.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mdl_sync.test rename to storage/eloq/mysql-test/eloq_main/t/mdl_sync.test diff --git a/storage/eloq/mysql-test/mono_main/t/merge-big.test b/storage/eloq/mysql-test/eloq_main/t/merge-big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/merge-big.test rename to storage/eloq/mysql-test/eloq_main/t/merge-big.test diff --git a/storage/eloq/mysql-test/mono_main/t/merge.test b/storage/eloq/mysql-test/eloq_main/t/merge.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/merge.test rename to storage/eloq/mysql-test/eloq_main/t/merge.test diff --git a/storage/eloq/mysql-test/mono_main/t/merge_debug.test b/storage/eloq/mysql-test/eloq_main/t/merge_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/merge_debug.test rename to storage/eloq/mysql-test/eloq_main/t/merge_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/merge_innodb.test b/storage/eloq/mysql-test/eloq_main/t/merge_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/merge_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/merge_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/merge_mmap-master.opt b/storage/eloq/mysql-test/eloq_main/t/merge_mmap-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/merge_mmap-master.opt rename to storage/eloq/mysql-test/eloq_main/t/merge_mmap-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/merge_mmap.test b/storage/eloq/mysql-test/eloq_main/t/merge_mmap.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/merge_mmap.test rename to storage/eloq/mysql-test/eloq_main/t/merge_mmap.test diff --git a/storage/eloq/mysql-test/mono_main/t/metadata.test b/storage/eloq/mysql-test/eloq_main/t/metadata.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/metadata.test rename to storage/eloq/mysql-test/eloq_main/t/metadata.test diff --git a/storage/eloq/mysql-test/mono_main/t/mix2_myisam.test b/storage/eloq/mysql-test/eloq_main/t/mix2_myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mix2_myisam.test rename to storage/eloq/mysql-test/eloq_main/t/mix2_myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/mix2_myisam_ucs2.test b/storage/eloq/mysql-test/eloq_main/t/mix2_myisam_ucs2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mix2_myisam_ucs2.test rename to storage/eloq/mysql-test/eloq_main/t/mix2_myisam_ucs2.test diff --git a/storage/eloq/mysql-test/mono_main/t/mrr_derived_crash_4610.test b/storage/eloq/mysql-test/eloq_main/t/mrr_derived_crash_4610.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mrr_derived_crash_4610.test rename to storage/eloq/mysql-test/eloq_main/t/mrr_derived_crash_4610.test diff --git a/storage/eloq/mysql-test/mono_main/t/mrr_icp_extra.test b/storage/eloq/mysql-test/eloq_main/t/mrr_icp_extra.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mrr_icp_extra.test rename to storage/eloq/mysql-test/eloq_main/t/mrr_icp_extra.test diff --git a/storage/eloq/mysql-test/mono_main/t/multi_statement-master.opt b/storage/eloq/mysql-test/eloq_main/t/multi_statement-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/multi_statement-master.opt rename to storage/eloq/mysql-test/eloq_main/t/multi_statement-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/multi_statement.test b/storage/eloq/mysql-test/eloq_main/t/multi_statement.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/multi_statement.test rename to storage/eloq/mysql-test/eloq_main/t/multi_statement.test diff --git a/storage/eloq/mysql-test/mono_main/t/multi_update-master.opt b/storage/eloq/mysql-test/eloq_main/t/multi_update-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/multi_update-master.opt rename to storage/eloq/mysql-test/eloq_main/t/multi_update-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/multi_update.test b/storage/eloq/mysql-test/eloq_main/t/multi_update.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/multi_update.test rename to storage/eloq/mysql-test/eloq_main/t/multi_update.test diff --git a/storage/eloq/mysql-test/mono_main/t/multi_update_big.opt b/storage/eloq/mysql-test/eloq_main/t/multi_update_big.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/multi_update_big.opt rename to storage/eloq/mysql-test/eloq_main/t/multi_update_big.opt diff --git a/storage/eloq/mysql-test/mono_main/t/multi_update_big.test b/storage/eloq/mysql-test/eloq_main/t/multi_update_big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/multi_update_big.test rename to storage/eloq/mysql-test/eloq_main/t/multi_update_big.test diff --git a/storage/eloq/mysql-test/mono_main/t/multi_update_binlog.test b/storage/eloq/mysql-test/eloq_main/t/multi_update_binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/multi_update_binlog.test rename to storage/eloq/mysql-test/eloq_main/t/multi_update_binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/multi_update_debug.test b/storage/eloq/mysql-test/eloq_main/t/multi_update_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/multi_update_debug.test rename to storage/eloq/mysql-test/eloq_main/t/multi_update_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/multi_update_innodb.test b/storage/eloq/mysql-test/eloq_main/t/multi_update_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/multi_update_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/multi_update_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/multi_update_tiny_hash-master.opt b/storage/eloq/mysql-test/eloq_main/t/multi_update_tiny_hash-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/multi_update_tiny_hash-master.opt rename to storage/eloq/mysql-test/eloq_main/t/multi_update_tiny_hash-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/multi_update_tiny_hash.test b/storage/eloq/mysql-test/eloq_main/t/multi_update_tiny_hash.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/multi_update_tiny_hash.test rename to storage/eloq/mysql-test/eloq_main/t/multi_update_tiny_hash.test diff --git a/storage/eloq/mysql-test/mono_main/t/my_print_defaults.test b/storage/eloq/mysql-test/eloq_main/t/my_print_defaults.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/my_print_defaults.test rename to storage/eloq/mysql-test/eloq_main/t/my_print_defaults.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam-big.test b/storage/eloq/mysql-test/eloq_main/t/myisam-big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam-big.test rename to storage/eloq/mysql-test/eloq_main/t/myisam-big.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam-blob-master.opt b/storage/eloq/mysql-test/eloq_main/t/myisam-blob-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam-blob-master.opt rename to storage/eloq/mysql-test/eloq_main/t/myisam-blob-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/myisam-blob.test b/storage/eloq/mysql-test/eloq_main/t/myisam-blob.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam-blob.test rename to storage/eloq/mysql-test/eloq_main/t/myisam-blob.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam-master.opt b/storage/eloq/mysql-test/eloq_main/t/myisam-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam-master.opt rename to storage/eloq/mysql-test/eloq_main/t/myisam-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/myisam-optimize.test b/storage/eloq/mysql-test/eloq_main/t/myisam-optimize.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam-optimize.test rename to storage/eloq/mysql-test/eloq_main/t/myisam-optimize.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam-system.test b/storage/eloq/mysql-test/eloq_main/t/myisam-system.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam-system.test rename to storage/eloq/mysql-test/eloq_main/t/myisam-system.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam.test b/storage/eloq/mysql-test/eloq_main/t/myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam.test rename to storage/eloq/mysql-test/eloq_main/t/myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_crash_before_flush_keys-master.opt b/storage/eloq/mysql-test/eloq_main/t/myisam_crash_before_flush_keys-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_crash_before_flush_keys-master.opt rename to storage/eloq/mysql-test/eloq_main/t/myisam_crash_before_flush_keys-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_crash_before_flush_keys.test b/storage/eloq/mysql-test/eloq_main/t/myisam_crash_before_flush_keys.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_crash_before_flush_keys.test rename to storage/eloq/mysql-test/eloq_main/t/myisam_crash_before_flush_keys.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_debug.test b/storage/eloq/mysql-test/eloq_main/t/myisam_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_debug.test rename to storage/eloq/mysql-test/eloq_main/t/myisam_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_enable_keys-10506.test b/storage/eloq/mysql-test/eloq_main/t/myisam_enable_keys-10506.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_enable_keys-10506.test rename to storage/eloq/mysql-test/eloq_main/t/myisam_enable_keys-10506.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_explain_non_select_all.test b/storage/eloq/mysql-test/eloq_main/t/myisam_explain_non_select_all.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_explain_non_select_all.test rename to storage/eloq/mysql-test/eloq_main/t/myisam_explain_non_select_all.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_icp.test b/storage/eloq/mysql-test/eloq_main/t/myisam_icp.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_icp.test rename to storage/eloq/mysql-test/eloq_main/t/myisam_icp.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_icp_debug.test b/storage/eloq/mysql-test/eloq_main/t/myisam_icp_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_icp_debug.test rename to storage/eloq/mysql-test/eloq_main/t/myisam_icp_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_icp_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/myisam_icp_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_icp_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/myisam_icp_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_mrr.test b/storage/eloq/mysql-test/eloq_main/t/myisam_mrr.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_mrr.test rename to storage/eloq/mysql-test/eloq_main/t/myisam_mrr.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_optimize.test b/storage/eloq/mysql-test/eloq_main/t/myisam_optimize.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_optimize.test rename to storage/eloq/mysql-test/eloq_main/t/myisam_optimize.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_recover-master.opt b/storage/eloq/mysql-test/eloq_main/t/myisam_recover-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_recover-master.opt rename to storage/eloq/mysql-test/eloq_main/t/myisam_recover-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/myisam_recover.test b/storage/eloq/mysql-test/eloq_main/t/myisam_recover.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisam_recover.test rename to storage/eloq/mysql-test/eloq_main/t/myisam_recover.test diff --git a/storage/eloq/mysql-test/mono_main/t/myisampack.test b/storage/eloq/mysql-test/eloq_main/t/myisampack.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/myisampack.test rename to storage/eloq/mysql-test/eloq_main/t/myisampack.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql-bug41486.test b/storage/eloq/mysql-test/eloq_main/t/mysql-bug41486.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql-bug41486.test rename to storage/eloq/mysql-test/eloq_main/t/mysql-bug41486.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql-bug45236.test b/storage/eloq/mysql-test/eloq_main/t/mysql-bug45236.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql-bug45236.test rename to storage/eloq/mysql-test/eloq_main/t/mysql-bug45236.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql-metadata.test b/storage/eloq/mysql-test/eloq_main/t/mysql-metadata.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql-metadata.test rename to storage/eloq/mysql-test/eloq_main/t/mysql-metadata.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql.test b/storage/eloq/mysql-test/eloq_main/t/mysql.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql.test rename to storage/eloq/mysql-test/eloq_main/t/mysql.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql5613mysql.test b/storage/eloq/mysql-test/eloq_main/t/mysql5613mysql.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql5613mysql.test rename to storage/eloq/mysql-test/eloq_main/t/mysql5613mysql.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql57_virtual.test b/storage/eloq/mysql-test/eloq_main/t/mysql57_virtual.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql57_virtual.test rename to storage/eloq/mysql-test/eloq_main/t/mysql57_virtual.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_binary_mode.test b/storage/eloq/mysql-test/eloq_main/t/mysql_binary_mode.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_binary_mode.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_binary_mode.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_binary_zero_insert.test b/storage/eloq/mysql-test/eloq_main/t/mysql_binary_zero_insert.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_binary_zero_insert.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_binary_zero_insert.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_client_test-master.opt b/storage/eloq/mysql-test/eloq_main/t/mysql_client_test-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_client_test-master.opt rename to storage/eloq/mysql-test/eloq_main/t/mysql_client_test-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_client_test.test b/storage/eloq/mysql-test/eloq_main/t/mysql_client_test.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_client_test.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_client_test.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_client_test_comp-master.opt b/storage/eloq/mysql-test/eloq_main/t/mysql_client_test_comp-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_client_test_comp-master.opt rename to storage/eloq/mysql-test/eloq_main/t/mysql_client_test_comp-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_client_test_comp.test b/storage/eloq/mysql-test/eloq_main/t/mysql_client_test_comp.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_client_test_comp.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_client_test_comp.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_client_test_nonblock-master.opt b/storage/eloq/mysql-test/eloq_main/t/mysql_client_test_nonblock-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_client_test_nonblock-master.opt rename to storage/eloq/mysql-test/eloq_main/t/mysql_client_test_nonblock-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_client_test_nonblock.test b/storage/eloq/mysql-test/eloq_main/t/mysql_client_test_nonblock.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_client_test_nonblock.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_client_test_nonblock.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_comments.sql b/storage/eloq/mysql-test/eloq_main/t/mysql_comments.sql similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_comments.sql rename to storage/eloq/mysql-test/eloq_main/t/mysql_comments.sql diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_comments.test b/storage/eloq/mysql-test/eloq_main/t/mysql_comments.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_comments.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_comments.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_cp932.test b/storage/eloq/mysql-test/eloq_main/t/mysql_cp932.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_cp932.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_cp932.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_delimiter.sql b/storage/eloq/mysql-test/eloq_main/t/mysql_delimiter.sql similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_delimiter.sql rename to storage/eloq/mysql-test/eloq_main/t/mysql_delimiter.sql diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_delimiter_19799.sql b/storage/eloq/mysql-test/eloq_main/t/mysql_delimiter_19799.sql similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_delimiter_19799.sql rename to storage/eloq/mysql-test/eloq_main/t/mysql_delimiter_19799.sql diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_delimiter_source.sql b/storage/eloq/mysql-test/eloq_main/t/mysql_delimiter_source.sql similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_delimiter_source.sql rename to storage/eloq/mysql-test/eloq_main/t/mysql_delimiter_source.sql diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_embedded.test b/storage/eloq/mysql-test/eloq_main/t/mysql_embedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_embedded.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_embedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_install_db_win.test b/storage/eloq/mysql-test/eloq_main/t/mysql_install_db_win.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_install_db_win.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_install_db_win.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_json_mysql_upgrade.test b/storage/eloq/mysql-test/eloq_main/t/mysql_json_mysql_upgrade.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_json_mysql_upgrade.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_json_mysql_upgrade.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_json_mysql_upgrade_with_plugin_loaded.test b/storage/eloq/mysql-test/eloq_main/t/mysql_json_mysql_upgrade_with_plugin_loaded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_json_mysql_upgrade_with_plugin_loaded.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_json_mysql_upgrade_with_plugin_loaded.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_json_table_recreate.opt b/storage/eloq/mysql-test/eloq_main/t/mysql_json_table_recreate.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_json_table_recreate.opt rename to storage/eloq/mysql-test/eloq_main/t/mysql_json_table_recreate.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_json_table_recreate.test b/storage/eloq/mysql-test/eloq_main/t/mysql_json_table_recreate.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_json_table_recreate.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_json_table_recreate.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_locale_posix.test b/storage/eloq/mysql-test/eloq_main/t/mysql_locale_posix.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_locale_posix.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_locale_posix.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_not_windows.test b/storage/eloq/mysql-test/eloq_main/t/mysql_not_windows.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_not_windows.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_not_windows.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_protocols.test b/storage/eloq/mysql-test/eloq_main/t/mysql_protocols.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_protocols.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_protocols.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_tzinfo_to_sql_symlink.test b/storage/eloq/mysql-test/eloq_main/t/mysql_tzinfo_to_sql_symlink.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_tzinfo_to_sql_symlink.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_tzinfo_to_sql_symlink.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_upgrade-20228.test b/storage/eloq/mysql-test/eloq_main/t/mysql_upgrade-20228.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_upgrade-20228.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_upgrade-20228.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_upgrade-6984.opt b/storage/eloq/mysql-test/eloq_main/t/mysql_upgrade-6984.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_upgrade-6984.opt rename to storage/eloq/mysql-test/eloq_main/t/mysql_upgrade-6984.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_upgrade-6984.test b/storage/eloq/mysql-test/eloq_main/t/mysql_upgrade-6984.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_upgrade-6984.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_upgrade-6984.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_upgrade.test b/storage/eloq/mysql-test/eloq_main/t/mysql_upgrade.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_upgrade.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_upgrade.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_upgrade_mysql_json_datatype.test b/storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_mysql_json_datatype.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_upgrade_mysql_json_datatype.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_mysql_json_datatype.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_upgrade_no_innodb.test b/storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_no_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_upgrade_no_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_no_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_upgrade_noengine.test b/storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_noengine.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_upgrade_noengine.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_noengine.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_upgrade_ssl.test b/storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_ssl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_upgrade_ssl.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_ssl.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_upgrade_to_100502.test b/storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_to_100502.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_upgrade_to_100502.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_to_100502.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysql_upgrade_view.test b/storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_view.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysql_upgrade_view.test rename to storage/eloq/mysql-test/eloq_main/t/mysql_upgrade_view.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqladmin.test b/storage/eloq/mysql-test/eloq_main/t/mysqladmin.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqladmin.test rename to storage/eloq/mysql-test/eloq_main/t/mysqladmin.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlbinlog-innodb.test b/storage/eloq/mysql-test/eloq_main/t/mysqlbinlog-innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlbinlog-innodb.test rename to storage/eloq/mysql-test/eloq_main/t/mysqlbinlog-innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlbinlog-master.opt b/storage/eloq/mysql-test/eloq_main/t/mysqlbinlog-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlbinlog-master.opt rename to storage/eloq/mysql-test/eloq_main/t/mysqlbinlog-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlbinlog.test b/storage/eloq/mysql-test/eloq_main/t/mysqlbinlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlbinlog.test rename to storage/eloq/mysql-test/eloq_main/t/mysqlbinlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlbinlog_raw_mode.test b/storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_raw_mode.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlbinlog_raw_mode.test rename to storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_raw_mode.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlbinlog_row_big.test b/storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_row_big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlbinlog_row_big.test rename to storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_row_big.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlbinlog_row_compressed.test b/storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_row_compressed.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlbinlog_row_compressed.test rename to storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_row_compressed.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlbinlog_row_minimal.opt b/storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_row_minimal.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlbinlog_row_minimal.opt rename to storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_row_minimal.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlbinlog_row_minimal.test b/storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_row_minimal.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlbinlog_row_minimal.test rename to storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_row_minimal.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlbinlog_stmt_compressed.test b/storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_stmt_compressed.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlbinlog_stmt_compressed.test rename to storage/eloq/mysql-test/eloq_main/t/mysqlbinlog_stmt_compressed.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlcheck-master.opt b/storage/eloq/mysql-test/eloq_main/t/mysqlcheck-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlcheck-master.opt rename to storage/eloq/mysql-test/eloq_main/t/mysqlcheck-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlcheck.opt b/storage/eloq/mysql-test/eloq_main/t/mysqlcheck.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlcheck.opt rename to storage/eloq/mysql-test/eloq_main/t/mysqlcheck.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlcheck.test b/storage/eloq/mysql-test/eloq_main/t/mysqlcheck.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlcheck.test rename to storage/eloq/mysql-test/eloq_main/t/mysqlcheck.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqld--defaults-file.test b/storage/eloq/mysql-test/eloq_main/t/mysqld--defaults-file.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqld--defaults-file.test rename to storage/eloq/mysql-test/eloq_main/t/mysqld--defaults-file.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqld--help-aria.test b/storage/eloq/mysql-test/eloq_main/t/mysqld--help-aria.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqld--help-aria.test rename to storage/eloq/mysql-test/eloq_main/t/mysqld--help-aria.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqld--help.test b/storage/eloq/mysql-test/eloq_main/t/mysqld--help.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqld--help.test rename to storage/eloq/mysql-test/eloq_main/t/mysqld--help.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqld_help_crash-9183.test b/storage/eloq/mysql-test/eloq_main/t/mysqld_help_crash-9183.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqld_help_crash-9183.test rename to storage/eloq/mysql-test/eloq_main/t/mysqld_help_crash-9183.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqld_option_err.test b/storage/eloq/mysql-test/eloq_main/t/mysqld_option_err.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqld_option_err.test rename to storage/eloq/mysql-test/eloq_main/t/mysqld_option_err.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump-compat-102.opt b/storage/eloq/mysql-test/eloq_main/t/mysqldump-compat-102.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump-compat-102.opt rename to storage/eloq/mysql-test/eloq_main/t/mysqldump-compat-102.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump-compat-102.test b/storage/eloq/mysql-test/eloq_main/t/mysqldump-compat-102.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump-compat-102.test rename to storage/eloq/mysql-test/eloq_main/t/mysqldump-compat-102.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump-compat.opt b/storage/eloq/mysql-test/eloq_main/t/mysqldump-compat.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump-compat.opt rename to storage/eloq/mysql-test/eloq_main/t/mysqldump-compat.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump-compat.test b/storage/eloq/mysql-test/eloq_main/t/mysqldump-compat.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump-compat.test rename to storage/eloq/mysql-test/eloq_main/t/mysqldump-compat.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump-max-master.opt b/storage/eloq/mysql-test/eloq_main/t/mysqldump-max-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump-max-master.opt rename to storage/eloq/mysql-test/eloq_main/t/mysqldump-max-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump-max.test b/storage/eloq/mysql-test/eloq_main/t/mysqldump-max.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump-max.test rename to storage/eloq/mysql-test/eloq_main/t/mysqldump-max.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump-nl.test b/storage/eloq/mysql-test/eloq_main/t/mysqldump-nl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump-nl.test rename to storage/eloq/mysql-test/eloq_main/t/mysqldump-nl.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump-no-binlog-master.opt b/storage/eloq/mysql-test/eloq_main/t/mysqldump-no-binlog-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump-no-binlog-master.opt rename to storage/eloq/mysql-test/eloq_main/t/mysqldump-no-binlog-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump-no-binlog.test b/storage/eloq/mysql-test/eloq_main/t/mysqldump-no-binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump-no-binlog.test rename to storage/eloq/mysql-test/eloq_main/t/mysqldump-no-binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump-system.test b/storage/eloq/mysql-test/eloq_main/t/mysqldump-system.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump-system.test rename to storage/eloq/mysql-test/eloq_main/t/mysqldump-system.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump-utf8mb4.test b/storage/eloq/mysql-test/eloq_main/t/mysqldump-utf8mb4.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump-utf8mb4.test rename to storage/eloq/mysql-test/eloq_main/t/mysqldump-utf8mb4.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump.opt b/storage/eloq/mysql-test/eloq_main/t/mysqldump.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump.opt rename to storage/eloq/mysql-test/eloq_main/t/mysqldump.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump.test b/storage/eloq/mysql-test/eloq_main/t/mysqldump.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump.test rename to storage/eloq/mysql-test/eloq_main/t/mysqldump.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqldump_restore.test b/storage/eloq/mysql-test/eloq_main/t/mysqldump_restore.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqldump_restore.test rename to storage/eloq/mysql-test/eloq_main/t/mysqldump_restore.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlhotcopy_myisam.test b/storage/eloq/mysql-test/eloq_main/t/mysqlhotcopy_myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlhotcopy_myisam.test rename to storage/eloq/mysql-test/eloq_main/t/mysqlhotcopy_myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlshow.test b/storage/eloq/mysql-test/eloq_main/t/mysqlshow.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlshow.test rename to storage/eloq/mysql-test/eloq_main/t/mysqlshow.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlslap.opt b/storage/eloq/mysql-test/eloq_main/t/mysqlslap.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlslap.opt rename to storage/eloq/mysql-test/eloq_main/t/mysqlslap.opt diff --git a/storage/eloq/mysql-test/mono_main/t/mysqlslap.test b/storage/eloq/mysql-test/eloq_main/t/mysqlslap.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqlslap.test rename to storage/eloq/mysql-test/eloq_main/t/mysqlslap.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqltest.test b/storage/eloq/mysql-test/eloq_main/t/mysqltest.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqltest.test rename to storage/eloq/mysql-test/eloq_main/t/mysqltest.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqltest_256.test b/storage/eloq/mysql-test/eloq_main/t/mysqltest_256.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqltest_256.test rename to storage/eloq/mysql-test/eloq_main/t/mysqltest_256.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqltest_cont_on_error.test b/storage/eloq/mysql-test/eloq_main/t/mysqltest_cont_on_error.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqltest_cont_on_error.test rename to storage/eloq/mysql-test/eloq_main/t/mysqltest_cont_on_error.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqltest_ps.test b/storage/eloq/mysql-test/eloq_main/t/mysqltest_ps.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqltest_ps.test rename to storage/eloq/mysql-test/eloq_main/t/mysqltest_ps.test diff --git a/storage/eloq/mysql-test/mono_main/t/mysqltest_tracking_info.test b/storage/eloq/mysql-test/eloq_main/t/mysqltest_tracking_info.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/mysqltest_tracking_info.test rename to storage/eloq/mysql-test/eloq_main/t/mysqltest_tracking_info.test diff --git a/storage/eloq/mysql-test/mono_main/t/named_pipe-master.opt b/storage/eloq/mysql-test/eloq_main/t/named_pipe-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/named_pipe-master.opt rename to storage/eloq/mysql-test/eloq_main/t/named_pipe-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/named_pipe.test b/storage/eloq/mysql-test/eloq_main/t/named_pipe.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/named_pipe.test rename to storage/eloq/mysql-test/eloq_main/t/named_pipe.test diff --git a/storage/eloq/mysql-test/mono_main/t/negation_elimination.test b/storage/eloq/mysql-test/eloq_main/t/negation_elimination.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/negation_elimination.test rename to storage/eloq/mysql-test/eloq_main/t/negation_elimination.test diff --git a/storage/eloq/mysql-test/mono_main/t/nested_profiling.test b/storage/eloq/mysql-test/eloq_main/t/nested_profiling.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/nested_profiling.test rename to storage/eloq/mysql-test/eloq_main/t/nested_profiling.test diff --git a/storage/eloq/mysql-test/mono_main/t/no-threads-master.opt b/storage/eloq/mysql-test/eloq_main/t/no-threads-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/no-threads-master.opt rename to storage/eloq/mysql-test/eloq_main/t/no-threads-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/no-threads.test b/storage/eloq/mysql-test/eloq_main/t/no-threads.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/no-threads.test rename to storage/eloq/mysql-test/eloq_main/t/no-threads.test diff --git a/storage/eloq/mysql-test/mono_main/t/no_binlog.test b/storage/eloq/mysql-test/eloq_main/t/no_binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/no_binlog.test rename to storage/eloq/mysql-test/eloq_main/t/no_binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/non_blocking_api.test b/storage/eloq/mysql-test/eloq_main/t/non_blocking_api.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/non_blocking_api.test rename to storage/eloq/mysql-test/eloq_main/t/non_blocking_api.test diff --git a/storage/eloq/mysql-test/mono_main/t/not_embedded_server.test b/storage/eloq/mysql-test/eloq_main/t/not_embedded_server.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/not_embedded_server.test rename to storage/eloq/mysql-test/eloq_main/t/not_embedded_server.test diff --git a/storage/eloq/mysql-test/mono_main/t/not_partition.test b/storage/eloq/mysql-test/eloq_main/t/not_partition.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/not_partition.test rename to storage/eloq/mysql-test/eloq_main/t/not_partition.test diff --git a/storage/eloq/mysql-test/mono_main/t/null.test b/storage/eloq/mysql-test/eloq_main/t/null.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/null.test rename to storage/eloq/mysql-test/eloq_main/t/null.test diff --git a/storage/eloq/mysql-test/mono_main/t/null_key.test b/storage/eloq/mysql-test/eloq_main/t/null_key.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/null_key.test rename to storage/eloq/mysql-test/eloq_main/t/null_key.test diff --git a/storage/eloq/mysql-test/mono_main/t/odbc.test b/storage/eloq/mysql-test/eloq_main/t/odbc.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/odbc.test rename to storage/eloq/mysql-test/eloq_main/t/odbc.test diff --git a/storage/eloq/mysql-test/mono_main/t/olap.test b/storage/eloq/mysql-test/eloq_main/t/olap.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/olap.test rename to storage/eloq/mysql-test/eloq_main/t/olap.test diff --git a/storage/eloq/mysql-test/mono_main/t/old-mode-master.opt b/storage/eloq/mysql-test/eloq_main/t/old-mode-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/old-mode-master.opt rename to storage/eloq/mysql-test/eloq_main/t/old-mode-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/old-mode.test b/storage/eloq/mysql-test/eloq_main/t/old-mode.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/old-mode.test rename to storage/eloq/mysql-test/eloq_main/t/old-mode.test diff --git a/storage/eloq/mysql-test/mono_main/t/openssl_1.test b/storage/eloq/mysql-test/eloq_main/t/openssl_1.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/openssl_1.test rename to storage/eloq/mysql-test/eloq_main/t/openssl_1.test diff --git a/storage/eloq/mysql-test/mono_main/t/openssl_6975.combinations b/storage/eloq/mysql-test/eloq_main/t/openssl_6975.combinations similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/openssl_6975.combinations rename to storage/eloq/mysql-test/eloq_main/t/openssl_6975.combinations diff --git a/storage/eloq/mysql-test/mono_main/t/openssl_6975.test b/storage/eloq/mysql-test/eloq_main/t/openssl_6975.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/openssl_6975.test rename to storage/eloq/mysql-test/eloq_main/t/openssl_6975.test diff --git a/storage/eloq/mysql-test/mono_main/t/opt_trace.test b/storage/eloq/mysql-test/eloq_main/t/opt_trace.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/opt_trace.test rename to storage/eloq/mysql-test/eloq_main/t/opt_trace.test diff --git a/storage/eloq/mysql-test/mono_main/t/opt_trace_index_merge.test b/storage/eloq/mysql-test/eloq_main/t/opt_trace_index_merge.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/opt_trace_index_merge.test rename to storage/eloq/mysql-test/eloq_main/t/opt_trace_index_merge.test diff --git a/storage/eloq/mysql-test/mono_main/t/opt_trace_index_merge_innodb.test b/storage/eloq/mysql-test/eloq_main/t/opt_trace_index_merge_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/opt_trace_index_merge_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/opt_trace_index_merge_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/opt_trace_security.test b/storage/eloq/mysql-test/eloq_main/t/opt_trace_security.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/opt_trace_security.test rename to storage/eloq/mysql-test/eloq_main/t/opt_trace_security.test diff --git a/storage/eloq/mysql-test/mono_main/t/opt_trace_ucs2.test b/storage/eloq/mysql-test/eloq_main/t/opt_trace_ucs2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/opt_trace_ucs2.test rename to storage/eloq/mysql-test/eloq_main/t/opt_trace_ucs2.test diff --git a/storage/eloq/mysql-test/mono_main/t/opt_tvc.test b/storage/eloq/mysql-test/eloq_main/t/opt_tvc.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/opt_tvc.test rename to storage/eloq/mysql-test/eloq_main/t/opt_tvc.test diff --git a/storage/eloq/mysql-test/mono_main/t/order_by-mdev-10122.test b/storage/eloq/mysql-test/eloq_main/t/order_by-mdev-10122.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/order_by-mdev-10122.test rename to storage/eloq/mysql-test/eloq_main/t/order_by-mdev-10122.test diff --git a/storage/eloq/mysql-test/mono_main/t/order_by.test b/storage/eloq/mysql-test/eloq_main/t/order_by.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/order_by.test rename to storage/eloq/mysql-test/eloq_main/t/order_by.test diff --git a/storage/eloq/mysql-test/mono_main/t/order_by_innodb.test b/storage/eloq/mysql-test/eloq_main/t/order_by_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/order_by_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/order_by_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/order_by_optimizer.test b/storage/eloq/mysql-test/eloq_main/t/order_by_optimizer.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/order_by_optimizer.test rename to storage/eloq/mysql-test/eloq_main/t/order_by_optimizer.test diff --git a/storage/eloq/mysql-test/mono_main/t/order_by_optimizer_innodb.test b/storage/eloq/mysql-test/eloq_main/t/order_by_optimizer_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/order_by_optimizer_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/order_by_optimizer_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/order_by_pack_big.test b/storage/eloq/mysql-test/eloq_main/t/order_by_pack_big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/order_by_pack_big.test rename to storage/eloq/mysql-test/eloq_main/t/order_by_pack_big.test diff --git a/storage/eloq/mysql-test/mono_main/t/order_by_sortkey.test b/storage/eloq/mysql-test/eloq_main/t/order_by_sortkey.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/order_by_sortkey.test rename to storage/eloq/mysql-test/eloq_main/t/order_by_sortkey.test diff --git a/storage/eloq/mysql-test/mono_main/t/order_by_zerolength-4285.test b/storage/eloq/mysql-test/eloq_main/t/order_by_zerolength-4285.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/order_by_zerolength-4285.test rename to storage/eloq/mysql-test/eloq_main/t/order_by_zerolength-4285.test diff --git a/storage/eloq/mysql-test/mono_main/t/order_fill_sortbuf.test b/storage/eloq/mysql-test/eloq_main/t/order_fill_sortbuf.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/order_fill_sortbuf.test rename to storage/eloq/mysql-test/eloq_main/t/order_fill_sortbuf.test diff --git a/storage/eloq/mysql-test/mono_main/t/outfile.test b/storage/eloq/mysql-test/eloq_main/t/outfile.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/outfile.test rename to storage/eloq/mysql-test/eloq_main/t/outfile.test diff --git a/storage/eloq/mysql-test/mono_main/t/outfile_loaddata.test b/storage/eloq/mysql-test/eloq_main/t/outfile_loaddata.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/outfile_loaddata.test rename to storage/eloq/mysql-test/eloq_main/t/outfile_loaddata.test diff --git a/storage/eloq/mysql-test/mono_main/t/overflow.test b/storage/eloq/mysql-test/eloq_main/t/overflow.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/overflow.test rename to storage/eloq/mysql-test/eloq_main/t/overflow.test diff --git a/storage/eloq/mysql-test/mono_main/t/packet.test b/storage/eloq/mysql-test/eloq_main/t/packet.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/packet.test rename to storage/eloq/mysql-test/eloq_main/t/packet.test diff --git a/storage/eloq/mysql-test/mono_main/t/parser.test b/storage/eloq/mysql-test/eloq_main/t/parser.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/parser.test rename to storage/eloq/mysql-test/eloq_main/t/parser.test diff --git a/storage/eloq/mysql-test/mono_main/t/parser_bug21114_innodb.test b/storage/eloq/mysql-test/eloq_main/t/parser_bug21114_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/parser_bug21114_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/parser_bug21114_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/parser_not_embedded.test b/storage/eloq/mysql-test/eloq_main/t/parser_not_embedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/parser_not_embedded.test rename to storage/eloq/mysql-test/eloq_main/t/parser_not_embedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/parser_stack.test b/storage/eloq/mysql-test/eloq_main/t/parser_stack.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/parser_stack.test rename to storage/eloq/mysql-test/eloq_main/t/parser_stack.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition-master.opt b/storage/eloq/mysql-test/eloq_main/t/partition-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition-master.opt rename to storage/eloq/mysql-test/eloq_main/t/partition-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/partition.test b/storage/eloq/mysql-test/eloq_main/t/partition.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition.test rename to storage/eloq/mysql-test/eloq_main/t/partition.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_alter.test b/storage/eloq/mysql-test/eloq_main/t/partition_alter.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_alter.test rename to storage/eloq/mysql-test/eloq_main/t/partition_alter.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_binlog.test b/storage/eloq/mysql-test/eloq_main/t/partition_binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_binlog.test rename to storage/eloq/mysql-test/eloq_main/t/partition_binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_binlog_stmt.test b/storage/eloq/mysql-test/eloq_main/t/partition_binlog_stmt.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_binlog_stmt.test rename to storage/eloq/mysql-test/eloq_main/t/partition_binlog_stmt.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_blackhole.test b/storage/eloq/mysql-test/eloq_main/t/partition_blackhole.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_blackhole.test rename to storage/eloq/mysql-test/eloq_main/t/partition_blackhole.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_bug18198.test b/storage/eloq/mysql-test/eloq_main/t/partition_bug18198.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_bug18198.test rename to storage/eloq/mysql-test/eloq_main/t/partition_bug18198.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_cache.test b/storage/eloq/mysql-test/eloq_main/t/partition_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_cache.test rename to storage/eloq/mysql-test/eloq_main/t/partition_cache.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_cache_innodb.test b/storage/eloq/mysql-test/eloq_main/t/partition_cache_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_cache_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/partition_cache_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_cache_myisam.test b/storage/eloq/mysql-test/eloq_main/t/partition_cache_myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_cache_myisam.test rename to storage/eloq/mysql-test/eloq_main/t/partition_cache_myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_charset.test b/storage/eloq/mysql-test/eloq_main/t/partition_charset.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_charset.test rename to storage/eloq/mysql-test/eloq_main/t/partition_charset.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_column.test b/storage/eloq/mysql-test/eloq_main/t/partition_column.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_column.test rename to storage/eloq/mysql-test/eloq_main/t/partition_column.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_column_prune.test b/storage/eloq/mysql-test/eloq_main/t/partition_column_prune.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_column_prune.test rename to storage/eloq/mysql-test/eloq_main/t/partition_column_prune.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_csv.test b/storage/eloq/mysql-test/eloq_main/t/partition_csv.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_csv.test rename to storage/eloq/mysql-test/eloq_main/t/partition_csv.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_datatype.test b/storage/eloq/mysql-test/eloq_main/t/partition_datatype.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_datatype.test rename to storage/eloq/mysql-test/eloq_main/t/partition_datatype.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_debug_sync.test b/storage/eloq/mysql-test/eloq_main/t/partition_debug_sync.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_debug_sync.test rename to storage/eloq/mysql-test/eloq_main/t/partition_debug_sync.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_default.test b/storage/eloq/mysql-test/eloq_main/t/partition_default.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_default.test rename to storage/eloq/mysql-test/eloq_main/t/partition_default.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_disabled-master.opt b/storage/eloq/mysql-test/eloq_main/t/partition_disabled-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_disabled-master.opt rename to storage/eloq/mysql-test/eloq_main/t/partition_disabled-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/partition_disabled.test b/storage/eloq/mysql-test/eloq_main/t/partition_disabled.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_disabled.test rename to storage/eloq/mysql-test/eloq_main/t/partition_disabled.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_error.test b/storage/eloq/mysql-test/eloq_main/t/partition_error.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_error.test rename to storage/eloq/mysql-test/eloq_main/t/partition_error.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_example.opt b/storage/eloq/mysql-test/eloq_main/t/partition_example.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_example.opt rename to storage/eloq/mysql-test/eloq_main/t/partition_example.opt diff --git a/storage/eloq/mysql-test/mono_main/t/partition_example.test b/storage/eloq/mysql-test/eloq_main/t/partition_example.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_example.test rename to storage/eloq/mysql-test/eloq_main/t/partition_example.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_exchange-master.opt b/storage/eloq/mysql-test/eloq_main/t/partition_exchange-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_exchange-master.opt rename to storage/eloq/mysql-test/eloq_main/t/partition_exchange-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/partition_exchange.test b/storage/eloq/mysql-test/eloq_main/t/partition_exchange.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_exchange.test rename to storage/eloq/mysql-test/eloq_main/t/partition_exchange.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_explicit_prune.test b/storage/eloq/mysql-test/eloq_main/t/partition_explicit_prune.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_explicit_prune.test rename to storage/eloq/mysql-test/eloq_main/t/partition_explicit_prune.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_grant.test b/storage/eloq/mysql-test/eloq_main/t/partition_grant.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_grant.test rename to storage/eloq/mysql-test/eloq_main/t/partition_grant.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_hash.test b/storage/eloq/mysql-test/eloq_main/t/partition_hash.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_hash.test rename to storage/eloq/mysql-test/eloq_main/t/partition_hash.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_innodb.test b/storage/eloq/mysql-test/eloq_main/t/partition_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/partition_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_innodb_plugin.test b/storage/eloq/mysql-test/eloq_main/t/partition_innodb_plugin.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_innodb_plugin.test rename to storage/eloq/mysql-test/eloq_main/t/partition_innodb_plugin.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_innodb_semi_consistent-master.opt b/storage/eloq/mysql-test/eloq_main/t/partition_innodb_semi_consistent-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_innodb_semi_consistent-master.opt rename to storage/eloq/mysql-test/eloq_main/t/partition_innodb_semi_consistent-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/partition_innodb_semi_consistent.test b/storage/eloq/mysql-test/eloq_main/t/partition_innodb_semi_consistent.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_innodb_semi_consistent.test rename to storage/eloq/mysql-test/eloq_main/t/partition_innodb_semi_consistent.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_innodb_stmt.test b/storage/eloq/mysql-test/eloq_main/t/partition_innodb_stmt.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_innodb_stmt.test rename to storage/eloq/mysql-test/eloq_main/t/partition_innodb_stmt.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_key_cache.test b/storage/eloq/mysql-test/eloq_main/t/partition_key_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_key_cache.test rename to storage/eloq/mysql-test/eloq_main/t/partition_key_cache.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_list.test b/storage/eloq/mysql-test/eloq_main/t/partition_list.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_list.test rename to storage/eloq/mysql-test/eloq_main/t/partition_list.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_mgm.test b/storage/eloq/mysql-test/eloq_main/t/partition_mgm.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_mgm.test rename to storage/eloq/mysql-test/eloq_main/t/partition_mgm.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_mgm_err.test b/storage/eloq/mysql-test/eloq_main/t/partition_mgm_err.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_mgm_err.test rename to storage/eloq/mysql-test/eloq_main/t/partition_mgm_err.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_mgm_err2.test b/storage/eloq/mysql-test/eloq_main/t/partition_mgm_err2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_mgm_err2.test rename to storage/eloq/mysql-test/eloq_main/t/partition_mgm_err2.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_mrr_aria.test b/storage/eloq/mysql-test/eloq_main/t/partition_mrr_aria.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_mrr_aria.test rename to storage/eloq/mysql-test/eloq_main/t/partition_mrr_aria.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_mrr_innodb.test b/storage/eloq/mysql-test/eloq_main/t/partition_mrr_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_mrr_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/partition_mrr_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_mrr_myisam.test b/storage/eloq/mysql-test/eloq_main/t/partition_mrr_myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_mrr_myisam.test rename to storage/eloq/mysql-test/eloq_main/t/partition_mrr_myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_myisam.test b/storage/eloq/mysql-test/eloq_main/t/partition_myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_myisam.test rename to storage/eloq/mysql-test/eloq_main/t/partition_myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_not_blackhole-master.opt b/storage/eloq/mysql-test/eloq_main/t/partition_not_blackhole-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_not_blackhole-master.opt rename to storage/eloq/mysql-test/eloq_main/t/partition_not_blackhole-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/partition_not_blackhole.test b/storage/eloq/mysql-test/eloq_main/t/partition_not_blackhole.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_not_blackhole.test rename to storage/eloq/mysql-test/eloq_main/t/partition_not_blackhole.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_not_windows-master.opt b/storage/eloq/mysql-test/eloq_main/t/partition_not_windows-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_not_windows-master.opt rename to storage/eloq/mysql-test/eloq_main/t/partition_not_windows-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/partition_not_windows.test b/storage/eloq/mysql-test/eloq_main/t/partition_not_windows.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_not_windows.test rename to storage/eloq/mysql-test/eloq_main/t/partition_not_windows.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_open_files_limit-master.opt b/storage/eloq/mysql-test/eloq_main/t/partition_open_files_limit-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_open_files_limit-master.opt rename to storage/eloq/mysql-test/eloq_main/t/partition_open_files_limit-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/partition_open_files_limit.test b/storage/eloq/mysql-test/eloq_main/t/partition_open_files_limit.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_open_files_limit.test rename to storage/eloq/mysql-test/eloq_main/t/partition_open_files_limit.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_order.test b/storage/eloq/mysql-test/eloq_main/t/partition_order.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_order.test rename to storage/eloq/mysql-test/eloq_main/t/partition_order.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_pruning.test b/storage/eloq/mysql-test/eloq_main/t/partition_pruning.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_pruning.test rename to storage/eloq/mysql-test/eloq_main/t/partition_pruning.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_range.test b/storage/eloq/mysql-test/eloq_main/t/partition_range.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_range.test rename to storage/eloq/mysql-test/eloq_main/t/partition_range.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_rename_longfilename.test b/storage/eloq/mysql-test/eloq_main/t/partition_rename_longfilename.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_rename_longfilename.test rename to storage/eloq/mysql-test/eloq_main/t/partition_rename_longfilename.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_symlink.test b/storage/eloq/mysql-test/eloq_main/t/partition_symlink.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_symlink.test rename to storage/eloq/mysql-test/eloq_main/t/partition_symlink.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_sync.test b/storage/eloq/mysql-test/eloq_main/t/partition_sync.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_sync.test rename to storage/eloq/mysql-test/eloq_main/t/partition_sync.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_truncate.test b/storage/eloq/mysql-test/eloq_main/t/partition_truncate.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_truncate.test rename to storage/eloq/mysql-test/eloq_main/t/partition_truncate.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_ucs2.test b/storage/eloq/mysql-test/eloq_main/t/partition_ucs2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_ucs2.test rename to storage/eloq/mysql-test/eloq_main/t/partition_ucs2.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_utf8-debug.test b/storage/eloq/mysql-test/eloq_main/t/partition_utf8-debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_utf8-debug.test rename to storage/eloq/mysql-test/eloq_main/t/partition_utf8-debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_utf8.test b/storage/eloq/mysql-test/eloq_main/t/partition_utf8.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_utf8.test rename to storage/eloq/mysql-test/eloq_main/t/partition_utf8.test diff --git a/storage/eloq/mysql-test/mono_main/t/partition_windows.test b/storage/eloq/mysql-test/eloq_main/t/partition_windows.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/partition_windows.test rename to storage/eloq/mysql-test/eloq_main/t/partition_windows.test diff --git a/storage/eloq/mysql-test/mono_main/t/password_expiration.test b/storage/eloq/mysql-test/eloq_main/t/password_expiration.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/password_expiration.test rename to storage/eloq/mysql-test/eloq_main/t/password_expiration.test diff --git a/storage/eloq/mysql-test/mono_main/t/password_expiration_unix_socket.test b/storage/eloq/mysql-test/eloq_main/t/password_expiration_unix_socket.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/password_expiration_unix_socket.test rename to storage/eloq/mysql-test/eloq_main/t/password_expiration_unix_socket.test diff --git a/storage/eloq/mysql-test/mono_main/t/percona_nonflushing_analyze_debug.test b/storage/eloq/mysql-test/eloq_main/t/percona_nonflushing_analyze_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/percona_nonflushing_analyze_debug.test rename to storage/eloq/mysql-test/eloq_main/t/percona_nonflushing_analyze_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/perror-win.test b/storage/eloq/mysql-test/eloq_main/t/perror-win.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/perror-win.test rename to storage/eloq/mysql-test/eloq_main/t/perror-win.test diff --git a/storage/eloq/mysql-test/mono_main/t/perror.test b/storage/eloq/mysql-test/eloq_main/t/perror.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/perror.test rename to storage/eloq/mysql-test/eloq_main/t/perror.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin.opt b/storage/eloq/mysql-test/eloq_main/t/plugin.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin.opt rename to storage/eloq/mysql-test/eloq_main/t/plugin.opt diff --git a/storage/eloq/mysql-test/mono_main/t/plugin.test b/storage/eloq/mysql-test/eloq_main/t/plugin.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin.test rename to storage/eloq/mysql-test/eloq_main/t/plugin.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_auth.test b/storage/eloq/mysql-test/eloq_main/t/plugin_auth.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_auth.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_auth.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_auth_qa.test b/storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_auth_qa.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_auth_qa_1.test b/storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa_1.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_auth_qa_1.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa_1.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_auth_qa_2-master.opt b/storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa_2-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_auth_qa_2-master.opt rename to storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa_2-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_auth_qa_2.test b/storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa_2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_auth_qa_2.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa_2.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_auth_qa_3-master.opt b/storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa_3-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_auth_qa_3-master.opt rename to storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa_3-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_auth_qa_3.test b/storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa_3.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_auth_qa_3.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_auth_qa_3.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_innodb.opt b/storage/eloq/mysql-test/eloq_main/t/plugin_innodb.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_innodb.opt rename to storage/eloq/mysql-test/eloq_main/t/plugin_innodb.opt diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_innodb.test b/storage/eloq/mysql-test/eloq_main/t/plugin_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_load.opt b/storage/eloq/mysql-test/eloq_main/t/plugin_load.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_load.opt rename to storage/eloq/mysql-test/eloq_main/t/plugin_load.opt diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_load.test b/storage/eloq/mysql-test/eloq_main/t/plugin_load.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_load.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_load.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_load_option.opt b/storage/eloq/mysql-test/eloq_main/t/plugin_load_option.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_load_option.opt rename to storage/eloq/mysql-test/eloq_main/t/plugin_load_option.opt diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_load_option.test b/storage/eloq/mysql-test/eloq_main/t/plugin_load_option.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_load_option.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_load_option.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_loaderr.opt b/storage/eloq/mysql-test/eloq_main/t/plugin_loaderr.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_loaderr.opt rename to storage/eloq/mysql-test/eloq_main/t/plugin_loaderr.opt diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_loaderr.test b/storage/eloq/mysql-test/eloq_main/t/plugin_loaderr.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_loaderr.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_loaderr.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_maturity-master.opt b/storage/eloq/mysql-test/eloq_main/t/plugin_maturity-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_maturity-master.opt rename to storage/eloq/mysql-test/eloq_main/t/plugin_maturity-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_maturity.test b/storage/eloq/mysql-test/eloq_main/t/plugin_maturity.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_maturity.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_maturity.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_not_embedded.opt b/storage/eloq/mysql-test/eloq_main/t/plugin_not_embedded.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_not_embedded.opt rename to storage/eloq/mysql-test/eloq_main/t/plugin_not_embedded.opt diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_not_embedded.test b/storage/eloq/mysql-test/eloq_main/t/plugin_not_embedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_not_embedded.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_not_embedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/plugin_vars.test b/storage/eloq/mysql-test/eloq_main/t/plugin_vars.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/plugin_vars.test rename to storage/eloq/mysql-test/eloq_main/t/plugin_vars.test diff --git a/storage/eloq/mysql-test/mono_main/t/pool_of_threads.cnf b/storage/eloq/mysql-test/eloq_main/t/pool_of_threads.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/pool_of_threads.cnf rename to storage/eloq/mysql-test/eloq_main/t/pool_of_threads.cnf diff --git a/storage/eloq/mysql-test/mono_main/t/pool_of_threads.test b/storage/eloq/mysql-test/eloq_main/t/pool_of_threads.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/pool_of_threads.test rename to storage/eloq/mysql-test/eloq_main/t/pool_of_threads.test diff --git a/storage/eloq/mysql-test/mono_main/t/precedence.test b/storage/eloq/mysql-test/eloq_main/t/precedence.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/precedence.test rename to storage/eloq/mysql-test/eloq_main/t/precedence.test diff --git a/storage/eloq/mysql-test/mono_main/t/precedence_bugs.test b/storage/eloq/mysql-test/eloq_main/t/precedence_bugs.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/precedence_bugs.test rename to storage/eloq/mysql-test/eloq_main/t/precedence_bugs.test diff --git a/storage/eloq/mysql-test/mono_main/t/preload.test b/storage/eloq/mysql-test/eloq_main/t/preload.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/preload.test rename to storage/eloq/mysql-test/eloq_main/t/preload.test diff --git a/storage/eloq/mysql-test/mono_main/t/prepare.test b/storage/eloq/mysql-test/eloq_main/t/prepare.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/prepare.test rename to storage/eloq/mysql-test/eloq_main/t/prepare.test diff --git a/storage/eloq/mysql-test/mono_main/t/processlist.test b/storage/eloq/mysql-test/eloq_main/t/processlist.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/processlist.test rename to storage/eloq/mysql-test/eloq_main/t/processlist.test diff --git a/storage/eloq/mysql-test/mono_main/t/processlist_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/processlist_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/processlist_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/processlist_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/profiling.test b/storage/eloq/mysql-test/eloq_main/t/profiling.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/profiling.test rename to storage/eloq/mysql-test/eloq_main/t/profiling.test diff --git a/storage/eloq/mysql-test/mono_main/t/progress_976225.test b/storage/eloq/mysql-test/eloq_main/t/progress_976225.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/progress_976225.test rename to storage/eloq/mysql-test/eloq_main/t/progress_976225.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps-master.opt b/storage/eloq/mysql-test/eloq_main/t/ps-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ps-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ps.test b/storage/eloq/mysql-test/eloq_main/t/ps.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps.test rename to storage/eloq/mysql-test/eloq_main/t/ps.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_10nestset.test b/storage/eloq/mysql-test/eloq_main/t/ps_10nestset.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_10nestset.test rename to storage/eloq/mysql-test/eloq_main/t/ps_10nestset.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_11bugs.test b/storage/eloq/mysql-test/eloq_main/t/ps_11bugs.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_11bugs.test rename to storage/eloq/mysql-test/eloq_main/t/ps_11bugs.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_1general.test b/storage/eloq/mysql-test/eloq_main/t/ps_1general.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_1general.test rename to storage/eloq/mysql-test/eloq_main/t/ps_1general.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_2myisam.test b/storage/eloq/mysql-test/eloq_main/t/ps_2myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_2myisam.test rename to storage/eloq/mysql-test/eloq_main/t/ps_2myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_3innodb-master.opt b/storage/eloq/mysql-test/eloq_main/t/ps_3innodb-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_3innodb-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ps_3innodb-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ps_3innodb.test b/storage/eloq/mysql-test/eloq_main/t/ps_3innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_3innodb.test rename to storage/eloq/mysql-test/eloq_main/t/ps_3innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_4heap.test b/storage/eloq/mysql-test/eloq_main/t/ps_4heap.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_4heap.test rename to storage/eloq/mysql-test/eloq_main/t/ps_4heap.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_5merge.test b/storage/eloq/mysql-test/eloq_main/t/ps_5merge.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_5merge.test rename to storage/eloq/mysql-test/eloq_main/t/ps_5merge.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_change_master.test b/storage/eloq/mysql-test/eloq_main/t/ps_change_master.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_change_master.test rename to storage/eloq/mysql-test/eloq_main/t/ps_change_master.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_ddl.test b/storage/eloq/mysql-test/eloq_main/t/ps_ddl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_ddl.test rename to storage/eloq/mysql-test/eloq_main/t/ps_ddl.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_ddl1.test b/storage/eloq/mysql-test/eloq_main/t/ps_ddl1.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_ddl1.test rename to storage/eloq/mysql-test/eloq_main/t/ps_ddl1.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_error.test b/storage/eloq/mysql-test/eloq_main/t/ps_error.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_error.test rename to storage/eloq/mysql-test/eloq_main/t/ps_error.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_grant.test b/storage/eloq/mysql-test/eloq_main/t/ps_grant.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_grant.test rename to storage/eloq/mysql-test/eloq_main/t/ps_grant.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_innodb.test b/storage/eloq/mysql-test/eloq_main/t/ps_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/ps_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_max_subselect-5113.test b/storage/eloq/mysql-test/eloq_main/t/ps_max_subselect-5113.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_max_subselect-5113.test rename to storage/eloq/mysql-test/eloq_main/t/ps_max_subselect-5113.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_missed_cmds.test b/storage/eloq/mysql-test/eloq_main/t/ps_missed_cmds.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_missed_cmds.test rename to storage/eloq/mysql-test/eloq_main/t/ps_missed_cmds.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_missed_cmds_bin_prot.test b/storage/eloq/mysql-test/eloq_main/t/ps_missed_cmds_bin_prot.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_missed_cmds_bin_prot.test rename to storage/eloq/mysql-test/eloq_main/t/ps_missed_cmds_bin_prot.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_missed_cmds_bin_prot_not_embedded.test b/storage/eloq/mysql-test/eloq_main/t/ps_missed_cmds_bin_prot_not_embedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_missed_cmds_bin_prot_not_embedded.test rename to storage/eloq/mysql-test/eloq_main/t/ps_missed_cmds_bin_prot_not_embedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_missed_cmds_not_embedded.test b/storage/eloq/mysql-test/eloq_main/t/ps_missed_cmds_not_embedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_missed_cmds_not_embedded.test rename to storage/eloq/mysql-test/eloq_main/t/ps_missed_cmds_not_embedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_not_windows.test b/storage/eloq/mysql-test/eloq_main/t/ps_not_windows.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_not_windows.test rename to storage/eloq/mysql-test/eloq_main/t/ps_not_windows.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_qc_innodb.test b/storage/eloq/mysql-test/eloq_main/t/ps_qc_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_qc_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/ps_qc_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/ps_show_log.test b/storage/eloq/mysql-test/eloq_main/t/ps_show_log.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ps_show_log.test rename to storage/eloq/mysql-test/eloq_main/t/ps_show_log.test diff --git a/storage/eloq/mysql-test/mono_main/t/query_cache.test b/storage/eloq/mysql-test/eloq_main/t/query_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/query_cache.test rename to storage/eloq/mysql-test/eloq_main/t/query_cache.test diff --git a/storage/eloq/mysql-test/mono_main/t/query_cache_28249.test b/storage/eloq/mysql-test/eloq_main/t/query_cache_28249.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/query_cache_28249.test rename to storage/eloq/mysql-test/eloq_main/t/query_cache_28249.test diff --git a/storage/eloq/mysql-test/mono_main/t/query_cache_debug.test b/storage/eloq/mysql-test/eloq_main/t/query_cache_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/query_cache_debug.test rename to storage/eloq/mysql-test/eloq_main/t/query_cache_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/query_cache_innodb.test b/storage/eloq/mysql-test/eloq_main/t/query_cache_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/query_cache_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/query_cache_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/query_cache_merge.test b/storage/eloq/mysql-test/eloq_main/t/query_cache_merge.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/query_cache_merge.test rename to storage/eloq/mysql-test/eloq_main/t/query_cache_merge.test diff --git a/storage/eloq/mysql-test/mono_main/t/query_cache_notembedded-master.opt b/storage/eloq/mysql-test/eloq_main/t/query_cache_notembedded-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/query_cache_notembedded-master.opt rename to storage/eloq/mysql-test/eloq_main/t/query_cache_notembedded-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/query_cache_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/query_cache_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/query_cache_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/query_cache_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/query_cache_ps_no_prot.test b/storage/eloq/mysql-test/eloq_main/t/query_cache_ps_no_prot.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/query_cache_ps_no_prot.test rename to storage/eloq/mysql-test/eloq_main/t/query_cache_ps_no_prot.test diff --git a/storage/eloq/mysql-test/mono_main/t/query_cache_ps_ps_prot.test b/storage/eloq/mysql-test/eloq_main/t/query_cache_ps_ps_prot.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/query_cache_ps_ps_prot.test rename to storage/eloq/mysql-test/eloq_main/t/query_cache_ps_ps_prot.test diff --git a/storage/eloq/mysql-test/mono_main/t/query_cache_with_views.test b/storage/eloq/mysql-test/eloq_main/t/query_cache_with_views.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/query_cache_with_views.test rename to storage/eloq/mysql-test/eloq_main/t/query_cache_with_views.test diff --git a/storage/eloq/mysql-test/mono_main/t/quick_select_4161.test b/storage/eloq/mysql-test/eloq_main/t/quick_select_4161.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/quick_select_4161.test rename to storage/eloq/mysql-test/eloq_main/t/quick_select_4161.test diff --git a/storage/eloq/mysql-test/mono_main/t/range.test b/storage/eloq/mysql-test/eloq_main/t/range.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/range.test rename to storage/eloq/mysql-test/eloq_main/t/range.test diff --git a/storage/eloq/mysql-test/mono_main/t/range_debug.test b/storage/eloq/mysql-test/eloq_main/t/range_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/range_debug.test rename to storage/eloq/mysql-test/eloq_main/t/range_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/range_innodb.test b/storage/eloq/mysql-test/eloq_main/t/range_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/range_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/range_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/range_interrupted-13751.test b/storage/eloq/mysql-test/eloq_main/t/range_interrupted-13751.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/range_interrupted-13751.test rename to storage/eloq/mysql-test/eloq_main/t/range_interrupted-13751.test diff --git a/storage/eloq/mysql-test/mono_main/t/range_mrr_icp.test b/storage/eloq/mysql-test/eloq_main/t/range_mrr_icp.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/range_mrr_icp.test rename to storage/eloq/mysql-test/eloq_main/t/range_mrr_icp.test diff --git a/storage/eloq/mysql-test/mono_main/t/range_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/range_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/range_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/range_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/range_vs_index_merge.test b/storage/eloq/mysql-test/eloq_main/t/range_vs_index_merge.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/range_vs_index_merge.test rename to storage/eloq/mysql-test/eloq_main/t/range_vs_index_merge.test diff --git a/storage/eloq/mysql-test/mono_main/t/range_vs_index_merge_innodb.test b/storage/eloq/mysql-test/eloq_main/t/range_vs_index_merge_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/range_vs_index_merge_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/range_vs_index_merge_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/read_many_rows_innodb.test b/storage/eloq/mysql-test/eloq_main/t/read_many_rows_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/read_many_rows_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/read_many_rows_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/read_only.test b/storage/eloq/mysql-test/eloq_main/t/read_only.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/read_only.test rename to storage/eloq/mysql-test/eloq_main/t/read_only.test diff --git a/storage/eloq/mysql-test/mono_main/t/read_only_innodb.test b/storage/eloq/mysql-test/eloq_main/t/read_only_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/read_only_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/read_only_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/rename.test b/storage/eloq/mysql-test/eloq_main/t/rename.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/rename.test rename to storage/eloq/mysql-test/eloq_main/t/rename.test diff --git a/storage/eloq/mysql-test/mono_main/t/renamedb.test b/storage/eloq/mysql-test/eloq_main/t/renamedb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/renamedb.test rename to storage/eloq/mysql-test/eloq_main/t/renamedb.test diff --git a/storage/eloq/mysql-test/mono_main/t/reopen_temp_table.test b/storage/eloq/mysql-test/eloq_main/t/reopen_temp_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/reopen_temp_table.test rename to storage/eloq/mysql-test/eloq_main/t/reopen_temp_table.test diff --git a/storage/eloq/mysql-test/mono_main/t/repair.test b/storage/eloq/mysql-test/eloq_main/t/repair.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/repair.test rename to storage/eloq/mysql-test/eloq_main/t/repair.test diff --git a/storage/eloq/mysql-test/mono_main/t/repair_symlink-5543.test b/storage/eloq/mysql-test/eloq_main/t/repair_symlink-5543.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/repair_symlink-5543.test rename to storage/eloq/mysql-test/eloq_main/t/repair_symlink-5543.test diff --git a/storage/eloq/mysql-test/mono_main/t/replace.test b/storage/eloq/mysql-test/eloq_main/t/replace.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/replace.test rename to storage/eloq/mysql-test/eloq_main/t/replace.test diff --git a/storage/eloq/mysql-test/mono_main/t/replace_returning.test b/storage/eloq/mysql-test/eloq_main/t/replace_returning.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/replace_returning.test rename to storage/eloq/mysql-test/eloq_main/t/replace_returning.test diff --git a/storage/eloq/mysql-test/mono_main/t/replace_returning_datatypes.test b/storage/eloq/mysql-test/eloq_main/t/replace_returning_datatypes.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/replace_returning_datatypes.test rename to storage/eloq/mysql-test/eloq_main/t/replace_returning_datatypes.test diff --git a/storage/eloq/mysql-test/mono_main/t/replace_returning_err.test b/storage/eloq/mysql-test/eloq_main/t/replace_returning_err.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/replace_returning_err.test rename to storage/eloq/mysql-test/eloq_main/t/replace_returning_err.test diff --git a/storage/eloq/mysql-test/mono_main/t/require_secure_transport-master.opt b/storage/eloq/mysql-test/eloq_main/t/require_secure_transport-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/require_secure_transport-master.opt rename to storage/eloq/mysql-test/eloq_main/t/require_secure_transport-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/require_secure_transport.test b/storage/eloq/mysql-test/eloq_main/t/require_secure_transport.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/require_secure_transport.test rename to storage/eloq/mysql-test/eloq_main/t/require_secure_transport.test diff --git a/storage/eloq/mysql-test/mono_main/t/reset_connection.test b/storage/eloq/mysql-test/eloq_main/t/reset_connection.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/reset_connection.test rename to storage/eloq/mysql-test/eloq_main/t/reset_connection.test diff --git a/storage/eloq/mysql-test/mono_main/t/rollback.test b/storage/eloq/mysql-test/eloq_main/t/rollback.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/rollback.test rename to storage/eloq/mysql-test/eloq_main/t/rollback.test diff --git a/storage/eloq/mysql-test/mono_main/t/round.test b/storage/eloq/mysql-test/eloq_main/t/round.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/round.test rename to storage/eloq/mysql-test/eloq_main/t/round.test diff --git a/storage/eloq/mysql-test/mono_main/t/row-checksum-master.opt b/storage/eloq/mysql-test/eloq_main/t/row-checksum-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/row-checksum-master.opt rename to storage/eloq/mysql-test/eloq_main/t/row-checksum-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/row-checksum-old-master.opt b/storage/eloq/mysql-test/eloq_main/t/row-checksum-old-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/row-checksum-old-master.opt rename to storage/eloq/mysql-test/eloq_main/t/row-checksum-old-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/row-checksum-old.test b/storage/eloq/mysql-test/eloq_main/t/row-checksum-old.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/row-checksum-old.test rename to storage/eloq/mysql-test/eloq_main/t/row-checksum-old.test diff --git a/storage/eloq/mysql-test/mono_main/t/row-checksum.opt b/storage/eloq/mysql-test/eloq_main/t/row-checksum.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/row-checksum.opt rename to storage/eloq/mysql-test/eloq_main/t/row-checksum.opt diff --git a/storage/eloq/mysql-test/mono_main/t/row-checksum.test b/storage/eloq/mysql-test/eloq_main/t/row-checksum.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/row-checksum.test rename to storage/eloq/mysql-test/eloq_main/t/row-checksum.test diff --git a/storage/eloq/mysql-test/mono_main/t/row.test b/storage/eloq/mysql-test/eloq_main/t/row.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/row.test rename to storage/eloq/mysql-test/eloq_main/t/row.test diff --git a/storage/eloq/mysql-test/mono_main/t/rowid_filter.test b/storage/eloq/mysql-test/eloq_main/t/rowid_filter.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/rowid_filter.test rename to storage/eloq/mysql-test/eloq_main/t/rowid_filter.test diff --git a/storage/eloq/mysql-test/mono_main/t/rowid_filter_innodb.test b/storage/eloq/mysql-test/eloq_main/t/rowid_filter_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/rowid_filter_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/rowid_filter_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/rowid_filter_innodb_debug.test b/storage/eloq/mysql-test/eloq_main/t/rowid_filter_innodb_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/rowid_filter_innodb_debug.test rename to storage/eloq/mysql-test/eloq_main/t/rowid_filter_innodb_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/rowid_filter_myisam.test b/storage/eloq/mysql-test/eloq_main/t/rowid_filter_myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/rowid_filter_myisam.test rename to storage/eloq/mysql-test/eloq_main/t/rowid_filter_myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/rowid_filter_myisam_debug.test b/storage/eloq/mysql-test/eloq_main/t/rowid_filter_myisam_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/rowid_filter_myisam_debug.test rename to storage/eloq/mysql-test/eloq_main/t/rowid_filter_myisam_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/rowid_order_innodb.test b/storage/eloq/mysql-test/eloq_main/t/rowid_order_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/rowid_order_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/rowid_order_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/rownum.test b/storage/eloq/mysql-test/eloq_main/t/rownum.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/rownum.test rename to storage/eloq/mysql-test/eloq_main/t/rownum.test diff --git a/storage/eloq/mysql-test/mono_main/t/rpl_mysql_upgrade_slave_repo_check.test b/storage/eloq/mysql-test/eloq_main/t/rpl_mysql_upgrade_slave_repo_check.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/rpl_mysql_upgrade_slave_repo_check.test rename to storage/eloq/mysql-test/eloq_main/t/rpl_mysql_upgrade_slave_repo_check.test diff --git a/storage/eloq/mysql-test/mono_main/t/rpl_mysqldump_slave.test b/storage/eloq/mysql-test/eloq_main/t/rpl_mysqldump_slave.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/rpl_mysqldump_slave.test rename to storage/eloq/mysql-test/eloq_main/t/rpl_mysqldump_slave.test diff --git a/storage/eloq/mysql-test/mono_main/t/schema.test b/storage/eloq/mysql-test/eloq_main/t/schema.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/schema.test rename to storage/eloq/mysql-test/eloq_main/t/schema.test diff --git a/storage/eloq/mysql-test/mono_main/t/second_frac-9175.test b/storage/eloq/mysql-test/eloq_main/t/second_frac-9175.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/second_frac-9175.test rename to storage/eloq/mysql-test/eloq_main/t/second_frac-9175.test diff --git a/storage/eloq/mysql-test/mono_main/t/secure_file_priv_win-master.opt b/storage/eloq/mysql-test/eloq_main/t/secure_file_priv_win-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/secure_file_priv_win-master.opt rename to storage/eloq/mysql-test/eloq_main/t/secure_file_priv_win-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/secure_file_priv_win.test b/storage/eloq/mysql-test/eloq_main/t/secure_file_priv_win.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/secure_file_priv_win.test rename to storage/eloq/mysql-test/eloq_main/t/secure_file_priv_win.test diff --git a/storage/eloq/mysql-test/mono_main/t/select.test b/storage/eloq/mysql-test/eloq_main/t/select.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/select.test rename to storage/eloq/mysql-test/eloq_main/t/select.test diff --git a/storage/eloq/mysql-test/mono_main/t/select_debug.test b/storage/eloq/mysql-test/eloq_main/t/select_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/select_debug.test rename to storage/eloq/mysql-test/eloq_main/t/select_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/select_found.test b/storage/eloq/mysql-test/eloq_main/t/select_found.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/select_found.test rename to storage/eloq/mysql-test/eloq_main/t/select_found.test diff --git a/storage/eloq/mysql-test/mono_main/t/select_jcl6.test b/storage/eloq/mysql-test/eloq_main/t/select_jcl6.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/select_jcl6.test rename to storage/eloq/mysql-test/eloq_main/t/select_jcl6.test diff --git a/storage/eloq/mysql-test/mono_main/t/select_pkeycache-master.opt b/storage/eloq/mysql-test/eloq_main/t/select_pkeycache-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/select_pkeycache-master.opt rename to storage/eloq/mysql-test/eloq_main/t/select_pkeycache-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/select_pkeycache.test b/storage/eloq/mysql-test/eloq_main/t/select_pkeycache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/select_pkeycache.test rename to storage/eloq/mysql-test/eloq_main/t/select_pkeycache.test diff --git a/storage/eloq/mysql-test/mono_main/t/select_safe.test b/storage/eloq/mysql-test/eloq_main/t/select_safe.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/select_safe.test rename to storage/eloq/mysql-test/eloq_main/t/select_safe.test diff --git a/storage/eloq/mysql-test/mono_main/t/selectivity.opt b/storage/eloq/mysql-test/eloq_main/t/selectivity.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/selectivity.opt rename to storage/eloq/mysql-test/eloq_main/t/selectivity.opt diff --git a/storage/eloq/mysql-test/mono_main/t/selectivity.test b/storage/eloq/mysql-test/eloq_main/t/selectivity.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/selectivity.test rename to storage/eloq/mysql-test/eloq_main/t/selectivity.test diff --git a/storage/eloq/mysql-test/mono_main/t/selectivity_innodb.test b/storage/eloq/mysql-test/eloq_main/t/selectivity_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/selectivity_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/selectivity_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/selectivity_no_engine.test b/storage/eloq/mysql-test/eloq_main/t/selectivity_no_engine.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/selectivity_no_engine.test rename to storage/eloq/mysql-test/eloq_main/t/selectivity_no_engine.test diff --git a/storage/eloq/mysql-test/mono_main/t/servers.test b/storage/eloq/mysql-test/eloq_main/t/servers.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/servers.test rename to storage/eloq/mysql-test/eloq_main/t/servers.test diff --git a/storage/eloq/mysql-test/mono_main/t/session_tracker_last_gtid.test b/storage/eloq/mysql-test/eloq_main/t/session_tracker_last_gtid.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/session_tracker_last_gtid.test rename to storage/eloq/mysql-test/eloq_main/t/session_tracker_last_gtid.test diff --git a/storage/eloq/mysql-test/mono_main/t/set_operation.test b/storage/eloq/mysql-test/eloq_main/t/set_operation.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/set_operation.test rename to storage/eloq/mysql-test/eloq_main/t/set_operation.test diff --git a/storage/eloq/mysql-test/mono_main/t/set_operation_oracle.test b/storage/eloq/mysql-test/eloq_main/t/set_operation_oracle.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/set_operation_oracle.test rename to storage/eloq/mysql-test/eloq_main/t/set_operation_oracle.test diff --git a/storage/eloq/mysql-test/mono_main/t/set_password.test b/storage/eloq/mysql-test/eloq_main/t/set_password.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/set_password.test rename to storage/eloq/mysql-test/eloq_main/t/set_password.test diff --git a/storage/eloq/mysql-test/mono_main/t/set_statement.test b/storage/eloq/mysql-test/eloq_main/t/set_statement.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/set_statement.test rename to storage/eloq/mysql-test/eloq_main/t/set_statement.test diff --git a/storage/eloq/mysql-test/mono_main/t/set_statement_debug.test b/storage/eloq/mysql-test/eloq_main/t/set_statement_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/set_statement_debug.test rename to storage/eloq/mysql-test/eloq_main/t/set_statement_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/set_statement_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/set_statement_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/set_statement_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/set_statement_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/set_statement_notembedded_binlog.test b/storage/eloq/mysql-test/eloq_main/t/set_statement_notembedded_binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/set_statement_notembedded_binlog.test rename to storage/eloq/mysql-test/eloq_main/t/set_statement_notembedded_binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/set_statement_profiling.test b/storage/eloq/mysql-test/eloq_main/t/set_statement_profiling.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/set_statement_profiling.test rename to storage/eloq/mysql-test/eloq_main/t/set_statement_profiling.test diff --git a/storage/eloq/mysql-test/mono_main/t/show.test b/storage/eloq/mysql-test/eloq_main/t/show.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show.test rename to storage/eloq/mysql-test/eloq_main/t/show.test diff --git a/storage/eloq/mysql-test/mono_main/t/show_bad_definer-5553.test b/storage/eloq/mysql-test/eloq_main/t/show_bad_definer-5553.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_bad_definer-5553.test rename to storage/eloq/mysql-test/eloq_main/t/show_bad_definer-5553.test diff --git a/storage/eloq/mysql-test/mono_main/t/show_check-master.opt b/storage/eloq/mysql-test/eloq_main/t/show_check-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_check-master.opt rename to storage/eloq/mysql-test/eloq_main/t/show_check-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/show_check.test b/storage/eloq/mysql-test/eloq_main/t/show_check.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_check.test rename to storage/eloq/mysql-test/eloq_main/t/show_check.test diff --git a/storage/eloq/mysql-test/mono_main/t/show_create_user.test b/storage/eloq/mysql-test/eloq_main/t/show_create_user.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_create_user.test rename to storage/eloq/mysql-test/eloq_main/t/show_create_user.test diff --git a/storage/eloq/mysql-test/mono_main/t/show_explain.cc b/storage/eloq/mysql-test/eloq_main/t/show_explain.cc similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_explain.cc rename to storage/eloq/mysql-test/eloq_main/t/show_explain.cc diff --git a/storage/eloq/mysql-test/mono_main/t/show_explain.opt b/storage/eloq/mysql-test/eloq_main/t/show_explain.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_explain.opt rename to storage/eloq/mysql-test/eloq_main/t/show_explain.opt diff --git a/storage/eloq/mysql-test/mono_main/t/show_explain.test b/storage/eloq/mysql-test/eloq_main/t/show_explain.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_explain.test rename to storage/eloq/mysql-test/eloq_main/t/show_explain.test diff --git a/storage/eloq/mysql-test/mono_main/t/show_explain_non_select.test b/storage/eloq/mysql-test/eloq_main/t/show_explain_non_select.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_explain_non_select.test rename to storage/eloq/mysql-test/eloq_main/t/show_explain_non_select.test diff --git a/storage/eloq/mysql-test/mono_main/t/show_explain_ps.test b/storage/eloq/mysql-test/eloq_main/t/show_explain_ps.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_explain_ps.test rename to storage/eloq/mysql-test/eloq_main/t/show_explain_ps.test diff --git a/storage/eloq/mysql-test/mono_main/t/show_function_with_pad_char_to_full_length.test b/storage/eloq/mysql-test/eloq_main/t/show_function_with_pad_char_to_full_length.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_function_with_pad_char_to_full_length.test rename to storage/eloq/mysql-test/eloq_main/t/show_function_with_pad_char_to_full_length.test diff --git a/storage/eloq/mysql-test/mono_main/t/show_profile.test b/storage/eloq/mysql-test/eloq_main/t/show_profile.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_profile.test rename to storage/eloq/mysql-test/eloq_main/t/show_profile.test diff --git a/storage/eloq/mysql-test/mono_main/t/show_row_order-9226.test b/storage/eloq/mysql-test/eloq_main/t/show_row_order-9226.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/show_row_order-9226.test rename to storage/eloq/mysql-test/eloq_main/t/show_row_order-9226.test diff --git a/storage/eloq/mysql-test/mono_main/t/shutdown.test b/storage/eloq/mysql-test/eloq_main/t/shutdown.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/shutdown.test rename to storage/eloq/mysql-test/eloq_main/t/shutdown.test diff --git a/storage/eloq/mysql-test/mono_main/t/shutdown_not_windows.combinations b/storage/eloq/mysql-test/eloq_main/t/shutdown_not_windows.combinations similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/shutdown_not_windows.combinations rename to storage/eloq/mysql-test/eloq_main/t/shutdown_not_windows.combinations diff --git a/storage/eloq/mysql-test/mono_main/t/shutdown_not_windows.test b/storage/eloq/mysql-test/eloq_main/t/shutdown_not_windows.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/shutdown_not_windows.test rename to storage/eloq/mysql-test/eloq_main/t/shutdown_not_windows.test diff --git a/storage/eloq/mysql-test/mono_main/t/sighup-6580.test b/storage/eloq/mysql-test/eloq_main/t/sighup-6580.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sighup-6580.test rename to storage/eloq/mysql-test/eloq_main/t/sighup-6580.test diff --git a/storage/eloq/mysql-test/mono_main/t/signal.test b/storage/eloq/mysql-test/eloq_main/t/signal.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/signal.test rename to storage/eloq/mysql-test/eloq_main/t/signal.test diff --git a/storage/eloq/mysql-test/mono_main/t/signal_code.test b/storage/eloq/mysql-test/eloq_main/t/signal_code.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/signal_code.test rename to storage/eloq/mysql-test/eloq_main/t/signal_code.test diff --git a/storage/eloq/mysql-test/mono_main/t/signal_demo1.test b/storage/eloq/mysql-test/eloq_main/t/signal_demo1.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/signal_demo1.test rename to storage/eloq/mysql-test/eloq_main/t/signal_demo1.test diff --git a/storage/eloq/mysql-test/mono_main/t/signal_demo2.test b/storage/eloq/mysql-test/eloq_main/t/signal_demo2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/signal_demo2.test rename to storage/eloq/mysql-test/eloq_main/t/signal_demo2.test diff --git a/storage/eloq/mysql-test/mono_main/t/signal_demo3.test b/storage/eloq/mysql-test/eloq_main/t/signal_demo3.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/signal_demo3.test rename to storage/eloq/mysql-test/eloq_main/t/signal_demo3.test diff --git a/storage/eloq/mysql-test/mono_main/t/signal_sqlmode.test b/storage/eloq/mysql-test/eloq_main/t/signal_sqlmode.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/signal_sqlmode.test rename to storage/eloq/mysql-test/eloq_main/t/signal_sqlmode.test diff --git a/storage/eloq/mysql-test/mono_main/t/simultaneous_assignment.test b/storage/eloq/mysql-test/eloq_main/t/simultaneous_assignment.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/simultaneous_assignment.test rename to storage/eloq/mysql-test/eloq_main/t/simultaneous_assignment.test diff --git a/storage/eloq/mysql-test/mono_main/t/single_delete_update.test b/storage/eloq/mysql-test/eloq_main/t/single_delete_update.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/single_delete_update.test rename to storage/eloq/mysql-test/eloq_main/t/single_delete_update.test diff --git a/storage/eloq/mysql-test/mono_main/t/single_delete_update_innodb.test b/storage/eloq/mysql-test/eloq_main/t/single_delete_update_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/single_delete_update_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/single_delete_update_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/skip_grants.opt b/storage/eloq/mysql-test/eloq_main/t/skip_grants.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/skip_grants.opt rename to storage/eloq/mysql-test/eloq_main/t/skip_grants.opt diff --git a/storage/eloq/mysql-test/mono_main/t/skip_grants.test b/storage/eloq/mysql-test/eloq_main/t/skip_grants.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/skip_grants.test rename to storage/eloq/mysql-test/eloq_main/t/skip_grants.test diff --git a/storage/eloq/mysql-test/mono_main/t/skip_log_bin-master.opt b/storage/eloq/mysql-test/eloq_main/t/skip_log_bin-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/skip_log_bin-master.opt rename to storage/eloq/mysql-test/eloq_main/t/skip_log_bin-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/skip_log_bin.test b/storage/eloq/mysql-test/eloq_main/t/skip_log_bin.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/skip_log_bin.test rename to storage/eloq/mysql-test/eloq_main/t/skip_log_bin.test diff --git a/storage/eloq/mysql-test/mono_main/t/skip_name_resolve-master.opt b/storage/eloq/mysql-test/eloq_main/t/skip_name_resolve-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/skip_name_resolve-master.opt rename to storage/eloq/mysql-test/eloq_main/t/skip_name_resolve-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/skip_name_resolve.test b/storage/eloq/mysql-test/eloq_main/t/skip_name_resolve.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/skip_name_resolve.test rename to storage/eloq/mysql-test/eloq_main/t/skip_name_resolve.test diff --git a/storage/eloq/mysql-test/mono_main/t/slowlog_enospace-10508.test b/storage/eloq/mysql-test/eloq_main/t/slowlog_enospace-10508.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/slowlog_enospace-10508.test rename to storage/eloq/mysql-test/eloq_main/t/slowlog_enospace-10508.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-anchor-row-type-cursor.test b/storage/eloq/mysql-test/eloq_main/t/sp-anchor-row-type-cursor.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-anchor-row-type-cursor.test rename to storage/eloq/mysql-test/eloq_main/t/sp-anchor-row-type-cursor.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-anchor-row-type-table.test b/storage/eloq/mysql-test/eloq_main/t/sp-anchor-row-type-table.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-anchor-row-type-table.test rename to storage/eloq/mysql-test/eloq_main/t/sp-anchor-row-type-table.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-anchor-type.test b/storage/eloq/mysql-test/eloq_main/t/sp-anchor-type.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-anchor-type.test rename to storage/eloq/mysql-test/eloq_main/t/sp-anchor-type.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-big.test b/storage/eloq/mysql-test/eloq_main/t/sp-big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-big.test rename to storage/eloq/mysql-test/eloq_main/t/sp-big.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-bugs.test b/storage/eloq/mysql-test/eloq_main/t/sp-bugs.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-bugs.test rename to storage/eloq/mysql-test/eloq_main/t/sp-bugs.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-bugs2.test b/storage/eloq/mysql-test/eloq_main/t/sp-bugs2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-bugs2.test rename to storage/eloq/mysql-test/eloq_main/t/sp-bugs2.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-code.test b/storage/eloq/mysql-test/eloq_main/t/sp-code.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-code.test rename to storage/eloq/mysql-test/eloq_main/t/sp-code.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-condition-handler.test b/storage/eloq/mysql-test/eloq_main/t/sp-condition-handler.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-condition-handler.test rename to storage/eloq/mysql-test/eloq_main/t/sp-condition-handler.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-cursor.test b/storage/eloq/mysql-test/eloq_main/t/sp-cursor.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-cursor.test rename to storage/eloq/mysql-test/eloq_main/t/sp-cursor.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-destruct.test b/storage/eloq/mysql-test/eloq_main/t/sp-destruct.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-destruct.test rename to storage/eloq/mysql-test/eloq_main/t/sp-destruct.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-dynamic.test b/storage/eloq/mysql-test/eloq_main/t/sp-dynamic.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-dynamic.test rename to storage/eloq/mysql-test/eloq_main/t/sp-dynamic.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-error.test b/storage/eloq/mysql-test/eloq_main/t/sp-error.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-error.test rename to storage/eloq/mysql-test/eloq_main/t/sp-error.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-expr.test b/storage/eloq/mysql-test/eloq_main/t/sp-expr.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-expr.test rename to storage/eloq/mysql-test/eloq_main/t/sp-expr.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-fib.test b/storage/eloq/mysql-test/eloq_main/t/sp-fib.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-fib.test rename to storage/eloq/mysql-test/eloq_main/t/sp-fib.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-for-loop.test b/storage/eloq/mysql-test/eloq_main/t/sp-for-loop.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-for-loop.test rename to storage/eloq/mysql-test/eloq_main/t/sp-for-loop.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-group.test b/storage/eloq/mysql-test/eloq_main/t/sp-group.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-group.test rename to storage/eloq/mysql-test/eloq_main/t/sp-group.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-innodb.test b/storage/eloq/mysql-test/eloq_main/t/sp-innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-innodb.test rename to storage/eloq/mysql-test/eloq_main/t/sp-innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-lock.test b/storage/eloq/mysql-test/eloq_main/t/sp-lock.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-lock.test rename to storage/eloq/mysql-test/eloq_main/t/sp-lock.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-no-code.test b/storage/eloq/mysql-test/eloq_main/t/sp-no-code.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-no-code.test rename to storage/eloq/mysql-test/eloq_main/t/sp-no-code.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-no-valgrind.test b/storage/eloq/mysql-test/eloq_main/t/sp-no-valgrind.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-no-valgrind.test rename to storage/eloq/mysql-test/eloq_main/t/sp-no-valgrind.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-prelocking.test b/storage/eloq/mysql-test/eloq_main/t/sp-prelocking.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-prelocking.test rename to storage/eloq/mysql-test/eloq_main/t/sp-prelocking.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-row-vs-var.inc b/storage/eloq/mysql-test/eloq_main/t/sp-row-vs-var.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-row-vs-var.inc rename to storage/eloq/mysql-test/eloq_main/t/sp-row-vs-var.inc diff --git a/storage/eloq/mysql-test/mono_main/t/sp-row.test b/storage/eloq/mysql-test/eloq_main/t/sp-row.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-row.test rename to storage/eloq/mysql-test/eloq_main/t/sp-row.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-security-anchor-type.test b/storage/eloq/mysql-test/eloq_main/t/sp-security-anchor-type.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-security-anchor-type.test rename to storage/eloq/mysql-test/eloq_main/t/sp-security-anchor-type.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-security.test b/storage/eloq/mysql-test/eloq_main/t/sp-security.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-security.test rename to storage/eloq/mysql-test/eloq_main/t/sp-security.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-threads.test b/storage/eloq/mysql-test/eloq_main/t/sp-threads.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-threads.test rename to storage/eloq/mysql-test/eloq_main/t/sp-threads.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-ucs2.test b/storage/eloq/mysql-test/eloq_main/t/sp-ucs2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-ucs2.test rename to storage/eloq/mysql-test/eloq_main/t/sp-ucs2.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp-vars.test b/storage/eloq/mysql-test/eloq_main/t/sp-vars.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp-vars.test rename to storage/eloq/mysql-test/eloq_main/t/sp-vars.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp.test b/storage/eloq/mysql-test/eloq_main/t/sp.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp.test rename to storage/eloq/mysql-test/eloq_main/t/sp.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp2.test b/storage/eloq/mysql-test/eloq_main/t/sp2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp2.test rename to storage/eloq/mysql-test/eloq_main/t/sp2.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp_gis.test b/storage/eloq/mysql-test/eloq_main/t/sp_gis.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp_gis.test rename to storage/eloq/mysql-test/eloq_main/t/sp_gis.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp_missing_4665.test b/storage/eloq/mysql-test/eloq_main/t/sp_missing_4665.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp_missing_4665.test rename to storage/eloq/mysql-test/eloq_main/t/sp_missing_4665.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp_notembedded.opt b/storage/eloq/mysql-test/eloq_main/t/sp_notembedded.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp_notembedded.opt rename to storage/eloq/mysql-test/eloq_main/t/sp_notembedded.opt diff --git a/storage/eloq/mysql-test/mono_main/t/sp_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/sp_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/sp_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp_stress_case.test b/storage/eloq/mysql-test/eloq_main/t/sp_stress_case.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp_stress_case.test rename to storage/eloq/mysql-test/eloq_main/t/sp_stress_case.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp_sync.test b/storage/eloq/mysql-test/eloq_main/t/sp_sync.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp_sync.test rename to storage/eloq/mysql-test/eloq_main/t/sp_sync.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp_trans.test b/storage/eloq/mysql-test/eloq_main/t/sp_trans.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp_trans.test rename to storage/eloq/mysql-test/eloq_main/t/sp_trans.test diff --git a/storage/eloq/mysql-test/mono_main/t/sp_trans_log.test b/storage/eloq/mysql-test/eloq_main/t/sp_trans_log.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sp_trans_log.test rename to storage/eloq/mysql-test/eloq_main/t/sp_trans_log.test diff --git a/storage/eloq/mysql-test/mono_main/t/sql_mode.test b/storage/eloq/mysql-test/eloq_main/t/sql_mode.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sql_mode.test rename to storage/eloq/mysql-test/eloq_main/t/sql_mode.test diff --git a/storage/eloq/mysql-test/mono_main/t/sql_safe_updates.opt b/storage/eloq/mysql-test/eloq_main/t/sql_safe_updates.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sql_safe_updates.opt rename to storage/eloq/mysql-test/eloq_main/t/sql_safe_updates.opt diff --git a/storage/eloq/mysql-test/mono_main/t/sql_safe_updates.test b/storage/eloq/mysql-test/eloq_main/t/sql_safe_updates.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sql_safe_updates.test rename to storage/eloq/mysql-test/eloq_main/t/sql_safe_updates.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl-big.test b/storage/eloq/mysql-test/eloq_main/t/ssl-big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl-big.test rename to storage/eloq/mysql-test/eloq_main/t/ssl-big.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl.test b/storage/eloq/mysql-test/eloq_main/t/ssl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl.test rename to storage/eloq/mysql-test/eloq_main/t/ssl.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_7937.combinations b/storage/eloq/mysql-test/eloq_main/t/ssl_7937.combinations similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_7937.combinations rename to storage/eloq/mysql-test/eloq_main/t/ssl_7937.combinations diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_7937.test b/storage/eloq/mysql-test/eloq_main/t/ssl_7937.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_7937.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_7937.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_8k_key-master.opt b/storage/eloq/mysql-test/eloq_main/t/ssl_8k_key-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_8k_key-master.opt rename to storage/eloq/mysql-test/eloq_main/t/ssl_8k_key-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_8k_key.test b/storage/eloq/mysql-test/eloq_main/t/ssl_8k_key.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_8k_key.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_8k_key.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_and_innodb.test b/storage/eloq/mysql-test/eloq_main/t/ssl_and_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_and_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_and_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_ca.test b/storage/eloq/mysql-test/eloq_main/t/ssl_ca.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_ca.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_ca.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_cipher.opt b/storage/eloq/mysql-test/eloq_main/t/ssl_cipher.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_cipher.opt rename to storage/eloq/mysql-test/eloq_main/t/ssl_cipher.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_cipher.test b/storage/eloq/mysql-test/eloq_main/t/ssl_cipher.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_cipher.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_cipher.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_compress.test b/storage/eloq/mysql-test/eloq_main/t/ssl_compress.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_compress.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_compress.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_connect.test b/storage/eloq/mysql-test/eloq_main/t/ssl_connect.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_connect.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_connect.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_crl.combinations b/storage/eloq/mysql-test/eloq_main/t/ssl_crl.combinations similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_crl.combinations rename to storage/eloq/mysql-test/eloq_main/t/ssl_crl.combinations diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_crl.test b/storage/eloq/mysql-test/eloq_main/t/ssl_crl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_crl.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_crl.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_crl_clients.test b/storage/eloq/mysql-test/eloq_main/t/ssl_crl_clients.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_crl_clients.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_crl_clients.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_system_ca.combinations b/storage/eloq/mysql-test/eloq_main/t/ssl_system_ca.combinations similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_system_ca.combinations rename to storage/eloq/mysql-test/eloq_main/t/ssl_system_ca.combinations diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_system_ca.test b/storage/eloq/mysql-test/eloq_main/t/ssl_system_ca.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_system_ca.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_system_ca.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_timeout-9836.opt b/storage/eloq/mysql-test/eloq_main/t/ssl_timeout-9836.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_timeout-9836.opt rename to storage/eloq/mysql-test/eloq_main/t/ssl_timeout-9836.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_timeout-9836.test b/storage/eloq/mysql-test/eloq_main/t/ssl_timeout-9836.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_timeout-9836.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_timeout-9836.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_timeout.test b/storage/eloq/mysql-test/eloq_main/t/ssl_timeout.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_timeout.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_timeout.test diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_verify_ip.opt b/storage/eloq/mysql-test/eloq_main/t/ssl_verify_ip.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_verify_ip.opt rename to storage/eloq/mysql-test/eloq_main/t/ssl_verify_ip.opt diff --git a/storage/eloq/mysql-test/mono_main/t/ssl_verify_ip.test b/storage/eloq/mysql-test/eloq_main/t/ssl_verify_ip.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/ssl_verify_ip.test rename to storage/eloq/mysql-test/eloq_main/t/ssl_verify_ip.test diff --git a/storage/eloq/mysql-test/mono_main/t/stack-crash.test b/storage/eloq/mysql-test/eloq_main/t/stack-crash.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stack-crash.test rename to storage/eloq/mysql-test/eloq_main/t/stack-crash.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables-enospc.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables-enospc.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables-enospc.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables-enospc.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables_disabled.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables_disabled.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables_disabled.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables_disabled.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables_innodb.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables_innodb_debug.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables_innodb_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables_innodb_debug.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables_innodb_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables_missing.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables_missing.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables_missing.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables_missing.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables_myisam_debug.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables_myisam_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables_myisam_debug.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables_myisam_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables_par.inc b/storage/eloq/mysql-test/eloq_main/t/stat_tables_par.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables_par.inc rename to storage/eloq/mysql-test/eloq_main/t/stat_tables_par.inc diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables_par.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables_par.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables_par.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables_par.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables_par_innodb.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables_par_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables_par_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables_par_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables_partition.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables_partition.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables_partition.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables_partition.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables_rbr.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables_rbr.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables_rbr.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables_rbr.test diff --git a/storage/eloq/mysql-test/mono_main/t/stat_tables_repl.test b/storage/eloq/mysql-test/eloq_main/t/stat_tables_repl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/stat_tables_repl.test rename to storage/eloq/mysql-test/eloq_main/t/stat_tables_repl.test diff --git a/storage/eloq/mysql-test/mono_main/t/statement-expr.test b/storage/eloq/mysql-test/eloq_main/t/statement-expr.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/statement-expr.test rename to storage/eloq/mysql-test/eloq_main/t/statement-expr.test diff --git a/storage/eloq/mysql-test/mono_main/t/statistics.test b/storage/eloq/mysql-test/eloq_main/t/statistics.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/statistics.test rename to storage/eloq/mysql-test/eloq_main/t/statistics.test diff --git a/storage/eloq/mysql-test/mono_main/t/statistics_close.test b/storage/eloq/mysql-test/eloq_main/t/statistics_close.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/statistics_close.test rename to storage/eloq/mysql-test/eloq_main/t/statistics_close.test diff --git a/storage/eloq/mysql-test/mono_main/t/statistics_index_crash-7362.test b/storage/eloq/mysql-test/eloq_main/t/statistics_index_crash-7362.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/statistics_index_crash-7362.test rename to storage/eloq/mysql-test/eloq_main/t/statistics_index_crash-7362.test diff --git a/storage/eloq/mysql-test/mono_main/t/status-master.opt b/storage/eloq/mysql-test/eloq_main/t/status-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/status-master.opt rename to storage/eloq/mysql-test/eloq_main/t/status-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/status.test b/storage/eloq/mysql-test/eloq_main/t/status.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/status.test rename to storage/eloq/mysql-test/eloq_main/t/status.test diff --git a/storage/eloq/mysql-test/mono_main/t/status2.test b/storage/eloq/mysql-test/eloq_main/t/status2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/status2.test rename to storage/eloq/mysql-test/eloq_main/t/status2.test diff --git a/storage/eloq/mysql-test/mono_main/t/status_bug17954.test b/storage/eloq/mysql-test/eloq_main/t/status_bug17954.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/status_bug17954.test rename to storage/eloq/mysql-test/eloq_main/t/status_bug17954.test diff --git a/storage/eloq/mysql-test/mono_main/t/str_to_datetime_457.test b/storage/eloq/mysql-test/eloq_main/t/str_to_datetime_457.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/str_to_datetime_457.test rename to storage/eloq/mysql-test/eloq_main/t/str_to_datetime_457.test diff --git a/storage/eloq/mysql-test/mono_main/t/strict-master.opt b/storage/eloq/mysql-test/eloq_main/t/strict-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/strict-master.opt rename to storage/eloq/mysql-test/eloq_main/t/strict-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/strict.test b/storage/eloq/mysql-test/eloq_main/t/strict.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/strict.test rename to storage/eloq/mysql-test/eloq_main/t/strict.test diff --git a/storage/eloq/mysql-test/mono_main/t/strict_autoinc_1myisam.test b/storage/eloq/mysql-test/eloq_main/t/strict_autoinc_1myisam.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/strict_autoinc_1myisam.test rename to storage/eloq/mysql-test/eloq_main/t/strict_autoinc_1myisam.test diff --git a/storage/eloq/mysql-test/mono_main/t/strict_autoinc_2innodb.test b/storage/eloq/mysql-test/eloq_main/t/strict_autoinc_2innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/strict_autoinc_2innodb.test rename to storage/eloq/mysql-test/eloq_main/t/strict_autoinc_2innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/strict_autoinc_3heap.test b/storage/eloq/mysql-test/eloq_main/t/strict_autoinc_3heap.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/strict_autoinc_3heap.test rename to storage/eloq/mysql-test/eloq_main/t/strict_autoinc_3heap.test diff --git a/storage/eloq/mysql-test/mono_main/t/strings.test b/storage/eloq/mysql-test/eloq_main/t/strings.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/strings.test rename to storage/eloq/mysql-test/eloq_main/t/strings.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect-crash_15755.test b/storage/eloq/mysql-test/eloq_main/t/subselect-crash_15755.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect-crash_15755.test rename to storage/eloq/mysql-test/eloq_main/t/subselect-crash_15755.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect.test b/storage/eloq/mysql-test/eloq_main/t/subselect.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect.test rename to storage/eloq/mysql-test/eloq_main/t/subselect.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect2.test b/storage/eloq/mysql-test/eloq_main/t/subselect2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect2.test rename to storage/eloq/mysql-test/eloq_main/t/subselect2.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect3.inc b/storage/eloq/mysql-test/eloq_main/t/subselect3.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect3.inc rename to storage/eloq/mysql-test/eloq_main/t/subselect3.inc diff --git a/storage/eloq/mysql-test/mono_main/t/subselect3.test b/storage/eloq/mysql-test/eloq_main/t/subselect3.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect3.test rename to storage/eloq/mysql-test/eloq_main/t/subselect3.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect3_jcl6.test b/storage/eloq/mysql-test/eloq_main/t/subselect3_jcl6.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect3_jcl6.test rename to storage/eloq/mysql-test/eloq_main/t/subselect3_jcl6.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect4.test b/storage/eloq/mysql-test/eloq_main/t/subselect4.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect4.test rename to storage/eloq/mysql-test/eloq_main/t/subselect4.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_cache.test b/storage/eloq/mysql-test/eloq_main/t/subselect_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_cache.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_cache.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_debug.test b/storage/eloq/mysql-test/eloq_main/t/subselect_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_debug.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_exists2in.test b/storage/eloq/mysql-test/eloq_main/t/subselect_exists2in.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_exists2in.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_exists2in.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_exists2in_costmat.cnf b/storage/eloq/mysql-test/eloq_main/t/subselect_exists2in_costmat.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_exists2in_costmat.cnf rename to storage/eloq/mysql-test/eloq_main/t/subselect_exists2in_costmat.cnf diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_exists2in_costmat.test b/storage/eloq/mysql-test/eloq_main/t/subselect_exists2in_costmat.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_exists2in_costmat.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_exists2in_costmat.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_extra.test b/storage/eloq/mysql-test/eloq_main/t/subselect_extra.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_extra.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_extra.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_extra_no_semijoin.test b/storage/eloq/mysql-test/eloq_main/t/subselect_extra_no_semijoin.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_extra_no_semijoin.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_extra_no_semijoin.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_gis.test b/storage/eloq/mysql-test/eloq_main/t/subselect_gis.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_gis.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_gis.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_innodb.test b/storage/eloq/mysql-test/eloq_main/t/subselect_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_mat.test b/storage/eloq/mysql-test/eloq_main/t/subselect_mat.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_mat.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_mat.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_mat_cost-master.opt b/storage/eloq/mysql-test/eloq_main/t/subselect_mat_cost-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_mat_cost-master.opt rename to storage/eloq/mysql-test/eloq_main/t/subselect_mat_cost-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_mat_cost.cnf b/storage/eloq/mysql-test/eloq_main/t/subselect_mat_cost.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_mat_cost.cnf rename to storage/eloq/mysql-test/eloq_main/t/subselect_mat_cost.cnf diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_mat_cost.test b/storage/eloq/mysql-test/eloq_main/t/subselect_mat_cost.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_mat_cost.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_mat_cost.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_mat_cost_bugs.test b/storage/eloq/mysql-test/eloq_main/t/subselect_mat_cost_bugs.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_mat_cost_bugs.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_mat_cost_bugs.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_no_exists_to_in.test b/storage/eloq/mysql-test/eloq_main/t/subselect_no_exists_to_in.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_no_exists_to_in.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_no_exists_to_in.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_no_mat.test b/storage/eloq/mysql-test/eloq_main/t/subselect_no_mat.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_no_mat.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_no_mat.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_no_opts.test b/storage/eloq/mysql-test/eloq_main/t/subselect_no_opts.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_no_opts.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_no_opts.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_no_scache.test b/storage/eloq/mysql-test/eloq_main/t/subselect_no_scache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_no_scache.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_no_scache.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_no_semijoin.test b/storage/eloq/mysql-test/eloq_main/t/subselect_no_semijoin.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_no_semijoin.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_no_semijoin.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/subselect_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_nulls.test b/storage/eloq/mysql-test/eloq_main/t/subselect_nulls.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_nulls.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_nulls.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_partial_match.test b/storage/eloq/mysql-test/eloq_main/t/subselect_partial_match.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_partial_match.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_partial_match.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_sj.test b/storage/eloq/mysql-test/eloq_main/t/subselect_sj.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_sj.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_sj.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_sj2.test b/storage/eloq/mysql-test/eloq_main/t/subselect_sj2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_sj2.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_sj2.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_sj2_jcl6.test b/storage/eloq/mysql-test/eloq_main/t/subselect_sj2_jcl6.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_sj2_jcl6.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_sj2_jcl6.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_sj2_mat.test b/storage/eloq/mysql-test/eloq_main/t/subselect_sj2_mat.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_sj2_mat.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_sj2_mat.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_sj_aria.test b/storage/eloq/mysql-test/eloq_main/t/subselect_sj_aria.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_sj_aria.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_sj_aria.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_sj_jcl6.test b/storage/eloq/mysql-test/eloq_main/t/subselect_sj_jcl6.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_sj_jcl6.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_sj_jcl6.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_sj_mat.test b/storage/eloq/mysql-test/eloq_main/t/subselect_sj_mat.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_sj_mat.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_sj_mat.test diff --git a/storage/eloq/mysql-test/mono_main/t/subselect_sj_nonmerged.test b/storage/eloq/mysql-test/eloq_main/t/subselect_sj_nonmerged.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/subselect_sj_nonmerged.test rename to storage/eloq/mysql-test/eloq_main/t/subselect_sj_nonmerged.test diff --git a/storage/eloq/mysql-test/mono_main/t/sum_distinct-big.test b/storage/eloq/mysql-test/eloq_main/t/sum_distinct-big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sum_distinct-big.test rename to storage/eloq/mysql-test/eloq_main/t/sum_distinct-big.test diff --git a/storage/eloq/mysql-test/mono_main/t/sum_distinct.test b/storage/eloq/mysql-test/eloq_main/t/sum_distinct.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sum_distinct.test rename to storage/eloq/mysql-test/eloq_main/t/sum_distinct.test diff --git a/storage/eloq/mysql-test/mono_main/t/symlink-aria-11902.test b/storage/eloq/mysql-test/eloq_main/t/symlink-aria-11902.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/symlink-aria-11902.test rename to storage/eloq/mysql-test/eloq_main/t/symlink-aria-11902.test diff --git a/storage/eloq/mysql-test/mono_main/t/symlink-myisam-11902.test b/storage/eloq/mysql-test/eloq_main/t/symlink-myisam-11902.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/symlink-myisam-11902.test rename to storage/eloq/mysql-test/eloq_main/t/symlink-myisam-11902.test diff --git a/storage/eloq/mysql-test/mono_main/t/symlink.test b/storage/eloq/mysql-test/eloq_main/t/symlink.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/symlink.test rename to storage/eloq/mysql-test/eloq_main/t/symlink.test diff --git a/storage/eloq/mysql-test/mono_main/t/synchronization.test b/storage/eloq/mysql-test/eloq_main/t/synchronization.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/synchronization.test rename to storage/eloq/mysql-test/eloq_main/t/synchronization.test diff --git a/storage/eloq/mysql-test/mono_main/t/sysdate_is_now-master.opt b/storage/eloq/mysql-test/eloq_main/t/sysdate_is_now-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sysdate_is_now-master.opt rename to storage/eloq/mysql-test/eloq_main/t/sysdate_is_now-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/sysdate_is_now.test b/storage/eloq/mysql-test/eloq_main/t/sysdate_is_now.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/sysdate_is_now.test rename to storage/eloq/mysql-test/eloq_main/t/sysdate_is_now.test diff --git a/storage/eloq/mysql-test/mono_main/t/system_mysql_db.test b/storage/eloq/mysql-test/eloq_main/t/system_mysql_db.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/system_mysql_db.test rename to storage/eloq/mysql-test/eloq_main/t/system_mysql_db.test diff --git a/storage/eloq/mysql-test/mono_main/t/system_mysql_db_507.test b/storage/eloq/mysql-test/eloq_main/t/system_mysql_db_507.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/system_mysql_db_507.test rename to storage/eloq/mysql-test/eloq_main/t/system_mysql_db_507.test diff --git a/storage/eloq/mysql-test/mono_main/t/system_mysql_db_error_log-master.opt b/storage/eloq/mysql-test/eloq_main/t/system_mysql_db_error_log-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/system_mysql_db_error_log-master.opt rename to storage/eloq/mysql-test/eloq_main/t/system_mysql_db_error_log-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/system_mysql_db_error_log.test b/storage/eloq/mysql-test/eloq_main/t/system_mysql_db_error_log.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/system_mysql_db_error_log.test rename to storage/eloq/mysql-test/eloq_main/t/system_mysql_db_error_log.test diff --git a/storage/eloq/mysql-test/mono_main/t/system_mysql_db_fix40123.test b/storage/eloq/mysql-test/eloq_main/t/system_mysql_db_fix40123.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/system_mysql_db_fix40123.test rename to storage/eloq/mysql-test/eloq_main/t/system_mysql_db_fix40123.test diff --git a/storage/eloq/mysql-test/mono_main/t/system_mysql_db_fix50030.test b/storage/eloq/mysql-test/eloq_main/t/system_mysql_db_fix50030.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/system_mysql_db_fix50030.test rename to storage/eloq/mysql-test/eloq_main/t/system_mysql_db_fix50030.test diff --git a/storage/eloq/mysql-test/mono_main/t/system_mysql_db_fix50117.test b/storage/eloq/mysql-test/eloq_main/t/system_mysql_db_fix50117.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/system_mysql_db_fix50117.test rename to storage/eloq/mysql-test/eloq_main/t/system_mysql_db_fix50117.test diff --git a/storage/eloq/mysql-test/mono_main/t/system_mysql_db_refs.test b/storage/eloq/mysql-test/eloq_main/t/system_mysql_db_refs.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/system_mysql_db_refs.test rename to storage/eloq/mysql-test/eloq_main/t/system_mysql_db_refs.test diff --git a/storage/eloq/mysql-test/mono_main/t/system_time_debug.test b/storage/eloq/mysql-test/eloq_main/t/system_time_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/system_time_debug.test rename to storage/eloq/mysql-test/eloq_main/t/system_time_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/table_elim.test b/storage/eloq/mysql-test/eloq_main/t/table_elim.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/table_elim.test rename to storage/eloq/mysql-test/eloq_main/t/table_elim.test diff --git a/storage/eloq/mysql-test/mono_main/t/table_elim_debug.test b/storage/eloq/mysql-test/eloq_main/t/table_elim_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/table_elim_debug.test rename to storage/eloq/mysql-test/eloq_main/t/table_elim_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/table_keyinfo-6838.test b/storage/eloq/mysql-test/eloq_main/t/table_keyinfo-6838.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/table_keyinfo-6838.test rename to storage/eloq/mysql-test/eloq_main/t/table_keyinfo-6838.test diff --git a/storage/eloq/mysql-test/mono_main/t/table_options-5867.opt b/storage/eloq/mysql-test/eloq_main/t/table_options-5867.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/table_options-5867.opt rename to storage/eloq/mysql-test/eloq_main/t/table_options-5867.opt diff --git a/storage/eloq/mysql-test/mono_main/t/table_options-5867.test b/storage/eloq/mysql-test/eloq_main/t/table_options-5867.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/table_options-5867.test rename to storage/eloq/mysql-test/eloq_main/t/table_options-5867.test diff --git a/storage/eloq/mysql-test/mono_main/t/table_options.test b/storage/eloq/mysql-test/eloq_main/t/table_options.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/table_options.test rename to storage/eloq/mysql-test/eloq_main/t/table_options.test diff --git a/storage/eloq/mysql-test/mono_main/t/table_value_constr.test b/storage/eloq/mysql-test/eloq_main/t/table_value_constr.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/table_value_constr.test rename to storage/eloq/mysql-test/eloq_main/t/table_value_constr.test diff --git a/storage/eloq/mysql-test/mono_main/t/tablelock.test b/storage/eloq/mysql-test/eloq_main/t/tablelock.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/tablelock.test rename to storage/eloq/mysql-test/eloq_main/t/tablelock.test diff --git a/storage/eloq/mysql-test/mono_main/t/tablespace.test b/storage/eloq/mysql-test/eloq_main/t/tablespace.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/tablespace.test rename to storage/eloq/mysql-test/eloq_main/t/tablespace.test diff --git a/storage/eloq/mysql-test/mono_main/t/tc_heuristic_recover.test b/storage/eloq/mysql-test/eloq_main/t/tc_heuristic_recover.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/tc_heuristic_recover.test rename to storage/eloq/mysql-test/eloq_main/t/tc_heuristic_recover.test diff --git a/storage/eloq/mysql-test/mono_main/t/temp_table-master.opt b/storage/eloq/mysql-test/eloq_main/t/temp_table-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/temp_table-master.opt rename to storage/eloq/mysql-test/eloq_main/t/temp_table-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/temp_table.test b/storage/eloq/mysql-test/eloq_main/t/temp_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/temp_table.test rename to storage/eloq/mysql-test/eloq_main/t/temp_table.test diff --git a/storage/eloq/mysql-test/mono_main/t/temp_table_frm.test b/storage/eloq/mysql-test/eloq_main/t/temp_table_frm.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/temp_table_frm.test rename to storage/eloq/mysql-test/eloq_main/t/temp_table_frm.test diff --git a/storage/eloq/mysql-test/mono_main/t/temp_table_symlink.test b/storage/eloq/mysql-test/eloq_main/t/temp_table_symlink.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/temp_table_symlink.test rename to storage/eloq/mysql-test/eloq_main/t/temp_table_symlink.test diff --git a/storage/eloq/mysql-test/mono_main/t/temporal_literal.test b/storage/eloq/mysql-test/eloq_main/t/temporal_literal.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/temporal_literal.test rename to storage/eloq/mysql-test/eloq_main/t/temporal_literal.test diff --git a/storage/eloq/mysql-test/mono_main/t/temporal_scale_4283.test b/storage/eloq/mysql-test/eloq_main/t/temporal_scale_4283.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/temporal_scale_4283.test rename to storage/eloq/mysql-test/eloq_main/t/temporal_scale_4283.test diff --git a/storage/eloq/mysql-test/mono_main/t/thread_id_overflow.test b/storage/eloq/mysql-test/eloq_main/t/thread_id_overflow.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/thread_id_overflow.test rename to storage/eloq/mysql-test/eloq_main/t/thread_id_overflow.test diff --git a/storage/eloq/mysql-test/mono_main/t/thread_pool_info.opt b/storage/eloq/mysql-test/eloq_main/t/thread_pool_info.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/thread_pool_info.opt rename to storage/eloq/mysql-test/eloq_main/t/thread_pool_info.opt diff --git a/storage/eloq/mysql-test/mono_main/t/thread_pool_info.test b/storage/eloq/mysql-test/eloq_main/t/thread_pool_info.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/thread_pool_info.test rename to storage/eloq/mysql-test/eloq_main/t/thread_pool_info.test diff --git a/storage/eloq/mysql-test/mono_main/t/timeout.test b/storage/eloq/mysql-test/eloq_main/t/timeout.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/timeout.test rename to storage/eloq/mysql-test/eloq_main/t/timeout.test diff --git a/storage/eloq/mysql-test/mono_main/t/timezone-master.opt b/storage/eloq/mysql-test/eloq_main/t/timezone-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/timezone-master.opt rename to storage/eloq/mysql-test/eloq_main/t/timezone-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/timezone.test b/storage/eloq/mysql-test/eloq_main/t/timezone.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/timezone.test rename to storage/eloq/mysql-test/eloq_main/t/timezone.test diff --git a/storage/eloq/mysql-test/mono_main/t/timezone2.test b/storage/eloq/mysql-test/eloq_main/t/timezone2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/timezone2.test rename to storage/eloq/mysql-test/eloq_main/t/timezone2.test diff --git a/storage/eloq/mysql-test/mono_main/t/timezone3-master.opt b/storage/eloq/mysql-test/eloq_main/t/timezone3-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/timezone3-master.opt rename to storage/eloq/mysql-test/eloq_main/t/timezone3-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/timezone3.test b/storage/eloq/mysql-test/eloq_main/t/timezone3.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/timezone3.test rename to storage/eloq/mysql-test/eloq_main/t/timezone3.test diff --git a/storage/eloq/mysql-test/mono_main/t/timezone4-master.opt b/storage/eloq/mysql-test/eloq_main/t/timezone4-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/timezone4-master.opt rename to storage/eloq/mysql-test/eloq_main/t/timezone4-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/timezone4.test b/storage/eloq/mysql-test/eloq_main/t/timezone4.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/timezone4.test rename to storage/eloq/mysql-test/eloq_main/t/timezone4.test diff --git a/storage/eloq/mysql-test/mono_main/t/timezone_grant.test b/storage/eloq/mysql-test/eloq_main/t/timezone_grant.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/timezone_grant.test rename to storage/eloq/mysql-test/eloq_main/t/timezone_grant.test diff --git a/storage/eloq/mysql-test/mono_main/t/tls_version.opt b/storage/eloq/mysql-test/eloq_main/t/tls_version.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/tls_version.opt rename to storage/eloq/mysql-test/eloq_main/t/tls_version.opt diff --git a/storage/eloq/mysql-test/mono_main/t/tls_version.test b/storage/eloq/mysql-test/eloq_main/t/tls_version.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/tls_version.test rename to storage/eloq/mysql-test/eloq_main/t/tls_version.test diff --git a/storage/eloq/mysql-test/mono_main/t/tls_version1.opt b/storage/eloq/mysql-test/eloq_main/t/tls_version1.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/tls_version1.opt rename to storage/eloq/mysql-test/eloq_main/t/tls_version1.opt diff --git a/storage/eloq/mysql-test/mono_main/t/tls_version1.test b/storage/eloq/mysql-test/eloq_main/t/tls_version1.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/tls_version1.test rename to storage/eloq/mysql-test/eloq_main/t/tls_version1.test diff --git a/storage/eloq/mysql-test/mono_main/t/tmp_table_count-7586.test b/storage/eloq/mysql-test/eloq_main/t/tmp_table_count-7586.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/tmp_table_count-7586.test rename to storage/eloq/mysql-test/eloq_main/t/tmp_table_count-7586.test diff --git a/storage/eloq/mysql-test/mono_main/t/trans_read_only-master.opt b/storage/eloq/mysql-test/eloq_main/t/trans_read_only-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/trans_read_only-master.opt rename to storage/eloq/mysql-test/eloq_main/t/trans_read_only-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/trans_read_only.test b/storage/eloq/mysql-test/eloq_main/t/trans_read_only.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/trans_read_only.test rename to storage/eloq/mysql-test/eloq_main/t/trans_read_only.test diff --git a/storage/eloq/mysql-test/mono_main/t/transaction_timeout.test b/storage/eloq/mysql-test/eloq_main/t/transaction_timeout.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/transaction_timeout.test rename to storage/eloq/mysql-test/eloq_main/t/transaction_timeout.test diff --git a/storage/eloq/mysql-test/mono_main/t/trigger-compat.test b/storage/eloq/mysql-test/eloq_main/t/trigger-compat.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/trigger-compat.test rename to storage/eloq/mysql-test/eloq_main/t/trigger-compat.test diff --git a/storage/eloq/mysql-test/mono_main/t/trigger-trans.test b/storage/eloq/mysql-test/eloq_main/t/trigger-trans.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/trigger-trans.test rename to storage/eloq/mysql-test/eloq_main/t/trigger-trans.test diff --git a/storage/eloq/mysql-test/mono_main/t/trigger.test b/storage/eloq/mysql-test/eloq_main/t/trigger.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/trigger.test rename to storage/eloq/mysql-test/eloq_main/t/trigger.test diff --git a/storage/eloq/mysql-test/mono_main/t/trigger_no_defaults-11698.test b/storage/eloq/mysql-test/eloq_main/t/trigger_no_defaults-11698.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/trigger_no_defaults-11698.test rename to storage/eloq/mysql-test/eloq_main/t/trigger_no_defaults-11698.test diff --git a/storage/eloq/mysql-test/mono_main/t/trigger_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/trigger_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/trigger_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/trigger_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/trigger_null-8605.test b/storage/eloq/mysql-test/eloq_main/t/trigger_null-8605.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/trigger_null-8605.test rename to storage/eloq/mysql-test/eloq_main/t/trigger_null-8605.test diff --git a/storage/eloq/mysql-test/mono_main/t/trigger_wl3253.test b/storage/eloq/mysql-test/eloq_main/t/trigger_wl3253.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/trigger_wl3253.test rename to storage/eloq/mysql-test/eloq_main/t/trigger_wl3253.test diff --git a/storage/eloq/mysql-test/mono_main/t/truncate-stale-6500.test b/storage/eloq/mysql-test/eloq_main/t/truncate-stale-6500.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/truncate-stale-6500.test rename to storage/eloq/mysql-test/eloq_main/t/truncate-stale-6500.test diff --git a/storage/eloq/mysql-test/mono_main/t/truncate.test b/storage/eloq/mysql-test/eloq_main/t/truncate.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/truncate.test rename to storage/eloq/mysql-test/eloq_main/t/truncate.test diff --git a/storage/eloq/mysql-test/mono_main/t/truncate_badse.opt b/storage/eloq/mysql-test/eloq_main/t/truncate_badse.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/truncate_badse.opt rename to storage/eloq/mysql-test/eloq_main/t/truncate_badse.opt diff --git a/storage/eloq/mysql-test/mono_main/t/truncate_badse.test b/storage/eloq/mysql-test/eloq_main/t/truncate_badse.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/truncate_badse.test rename to storage/eloq/mysql-test/eloq_main/t/truncate_badse.test diff --git a/storage/eloq/mysql-test/mono_main/t/truncate_coverage.test b/storage/eloq/mysql-test/eloq_main/t/truncate_coverage.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/truncate_coverage.test rename to storage/eloq/mysql-test/eloq_main/t/truncate_coverage.test diff --git a/storage/eloq/mysql-test/mono_main/t/truncate_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/truncate_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/truncate_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/truncate_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_binary.test b/storage/eloq/mysql-test/eloq_main/t/type_binary.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_binary.test rename to storage/eloq/mysql-test/eloq_main/t/type_binary.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_bit.test b/storage/eloq/mysql-test/eloq_main/t/type_bit.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_bit.test rename to storage/eloq/mysql-test/eloq_main/t/type_bit.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_bit_innodb.test b/storage/eloq/mysql-test/eloq_main/t/type_bit_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_bit_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/type_bit_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_blob.test b/storage/eloq/mysql-test/eloq_main/t/type_blob.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_blob.test rename to storage/eloq/mysql-test/eloq_main/t/type_blob.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_date.test b/storage/eloq/mysql-test/eloq_main/t/type_date.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_date.test rename to storage/eloq/mysql-test/eloq_main/t/type_date.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_date_round.test b/storage/eloq/mysql-test/eloq_main/t/type_date_round.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_date_round.test rename to storage/eloq/mysql-test/eloq_main/t/type_date_round.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_datetime.test b/storage/eloq/mysql-test/eloq_main/t/type_datetime.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_datetime.test rename to storage/eloq/mysql-test/eloq_main/t/type_datetime.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_datetime_hires.test b/storage/eloq/mysql-test/eloq_main/t/type_datetime_hires.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_datetime_hires.test rename to storage/eloq/mysql-test/eloq_main/t/type_datetime_hires.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_datetime_round.test b/storage/eloq/mysql-test/eloq_main/t/type_datetime_round.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_datetime_round.test rename to storage/eloq/mysql-test/eloq_main/t/type_datetime_round.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_decimal.test b/storage/eloq/mysql-test/eloq_main/t/type_decimal.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_decimal.test rename to storage/eloq/mysql-test/eloq_main/t/type_decimal.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_enum.test b/storage/eloq/mysql-test/eloq_main/t/type_enum.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_enum.test rename to storage/eloq/mysql-test/eloq_main/t/type_enum.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_float.test b/storage/eloq/mysql-test/eloq_main/t/type_float.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_float.test rename to storage/eloq/mysql-test/eloq_main/t/type_float.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_hex_hybrid.test b/storage/eloq/mysql-test/eloq_main/t/type_hex_hybrid.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_hex_hybrid.test rename to storage/eloq/mysql-test/eloq_main/t/type_hex_hybrid.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_int.test b/storage/eloq/mysql-test/eloq_main/t/type_int.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_int.test rename to storage/eloq/mysql-test/eloq_main/t/type_int.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_interval.test b/storage/eloq/mysql-test/eloq_main/t/type_interval.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_interval.test rename to storage/eloq/mysql-test/eloq_main/t/type_interval.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_json.test b/storage/eloq/mysql-test/eloq_main/t/type_json.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_json.test rename to storage/eloq/mysql-test/eloq_main/t/type_json.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_nchar.test b/storage/eloq/mysql-test/eloq_main/t/type_nchar.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_nchar.test rename to storage/eloq/mysql-test/eloq_main/t/type_nchar.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_newdecimal-big.test b/storage/eloq/mysql-test/eloq_main/t/type_newdecimal-big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_newdecimal-big.test rename to storage/eloq/mysql-test/eloq_main/t/type_newdecimal-big.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_newdecimal.test b/storage/eloq/mysql-test/eloq_main/t/type_newdecimal.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_newdecimal.test rename to storage/eloq/mysql-test/eloq_main/t/type_newdecimal.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_num.test b/storage/eloq/mysql-test/eloq_main/t/type_num.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_num.test rename to storage/eloq/mysql-test/eloq_main/t/type_num.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_num_innodb.test b/storage/eloq/mysql-test/eloq_main/t/type_num_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_num_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/type_num_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_ranges.test b/storage/eloq/mysql-test/eloq_main/t/type_ranges.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_ranges.test rename to storage/eloq/mysql-test/eloq_main/t/type_ranges.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_row.test b/storage/eloq/mysql-test/eloq_main/t/type_row.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_row.test rename to storage/eloq/mysql-test/eloq_main/t/type_row.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_set.test b/storage/eloq/mysql-test/eloq_main/t/type_set.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_set.test rename to storage/eloq/mysql-test/eloq_main/t/type_set.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_temporal_innodb.test b/storage/eloq/mysql-test/eloq_main/t/type_temporal_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_temporal_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/type_temporal_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_temporal_mariadb53.test b/storage/eloq/mysql-test/eloq_main/t/type_temporal_mariadb53.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_temporal_mariadb53.test rename to storage/eloq/mysql-test/eloq_main/t/type_temporal_mariadb53.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_temporal_mysql56.test b/storage/eloq/mysql-test/eloq_main/t/type_temporal_mysql56.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_temporal_mysql56.test rename to storage/eloq/mysql-test/eloq_main/t/type_temporal_mysql56.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_temporal_mysql56_debug.test b/storage/eloq/mysql-test/eloq_main/t/type_temporal_mysql56_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_temporal_mysql56_debug.test rename to storage/eloq/mysql-test/eloq_main/t/type_temporal_mysql56_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_time.test b/storage/eloq/mysql-test/eloq_main/t/type_time.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_time.test rename to storage/eloq/mysql-test/eloq_main/t/type_time.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_time_6065.test b/storage/eloq/mysql-test/eloq_main/t/type_time_6065.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_time_6065.test rename to storage/eloq/mysql-test/eloq_main/t/type_time_6065.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_time_hires.test b/storage/eloq/mysql-test/eloq_main/t/type_time_hires.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_time_hires.test rename to storage/eloq/mysql-test/eloq_main/t/type_time_hires.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_time_round.test b/storage/eloq/mysql-test/eloq_main/t/type_time_round.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_time_round.test rename to storage/eloq/mysql-test/eloq_main/t/type_time_round.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_timestamp.test b/storage/eloq/mysql-test/eloq_main/t/type_timestamp.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_timestamp.test rename to storage/eloq/mysql-test/eloq_main/t/type_timestamp.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_timestamp_hires.test b/storage/eloq/mysql-test/eloq_main/t/type_timestamp_hires.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_timestamp_hires.test rename to storage/eloq/mysql-test/eloq_main/t/type_timestamp_hires.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_timestamp_round.test b/storage/eloq/mysql-test/eloq_main/t/type_timestamp_round.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_timestamp_round.test rename to storage/eloq/mysql-test/eloq_main/t/type_timestamp_round.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_uint.test b/storage/eloq/mysql-test/eloq_main/t/type_uint.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_uint.test rename to storage/eloq/mysql-test/eloq_main/t/type_uint.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_varchar.opt b/storage/eloq/mysql-test/eloq_main/t/type_varchar.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_varchar.opt rename to storage/eloq/mysql-test/eloq_main/t/type_varchar.opt diff --git a/storage/eloq/mysql-test/mono_main/t/type_varchar.test b/storage/eloq/mysql-test/eloq_main/t/type_varchar.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_varchar.test rename to storage/eloq/mysql-test/eloq_main/t/type_varchar.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_varchar_mysql41.test b/storage/eloq/mysql-test/eloq_main/t/type_varchar_mysql41.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_varchar_mysql41.test rename to storage/eloq/mysql-test/eloq_main/t/type_varchar_mysql41.test diff --git a/storage/eloq/mysql-test/mono_main/t/type_year.test b/storage/eloq/mysql-test/eloq_main/t/type_year.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/type_year.test rename to storage/eloq/mysql-test/eloq_main/t/type_year.test diff --git a/storage/eloq/mysql-test/mono_main/t/udf.test b/storage/eloq/mysql-test/eloq_main/t/udf.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/udf.test rename to storage/eloq/mysql-test/eloq_main/t/udf.test diff --git a/storage/eloq/mysql-test/mono_main/t/udf_debug_sync.test b/storage/eloq/mysql-test/eloq_main/t/udf_debug_sync.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/udf_debug_sync.test rename to storage/eloq/mysql-test/eloq_main/t/udf_debug_sync.test diff --git a/storage/eloq/mysql-test/mono_main/t/udf_notembedded.test b/storage/eloq/mysql-test/eloq_main/t/udf_notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/udf_notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/udf_notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/udf_query_cache.test b/storage/eloq/mysql-test/eloq_main/t/udf_query_cache.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/udf_query_cache.test rename to storage/eloq/mysql-test/eloq_main/t/udf_query_cache.test diff --git a/storage/eloq/mysql-test/mono_main/t/udf_skip_grants-master.opt b/storage/eloq/mysql-test/eloq_main/t/udf_skip_grants-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/udf_skip_grants-master.opt rename to storage/eloq/mysql-test/eloq_main/t/udf_skip_grants-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/udf_skip_grants.test b/storage/eloq/mysql-test/eloq_main/t/udf_skip_grants.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/udf_skip_grants.test rename to storage/eloq/mysql-test/eloq_main/t/udf_skip_grants.test diff --git a/storage/eloq/mysql-test/mono_main/t/union-master.opt b/storage/eloq/mysql-test/eloq_main/t/union-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/union-master.opt rename to storage/eloq/mysql-test/eloq_main/t/union-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/union.test b/storage/eloq/mysql-test/eloq_main/t/union.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/union.test rename to storage/eloq/mysql-test/eloq_main/t/union.test diff --git a/storage/eloq/mysql-test/mono_main/t/union_crash-714.test b/storage/eloq/mysql-test/eloq_main/t/union_crash-714.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/union_crash-714.test rename to storage/eloq/mysql-test/eloq_main/t/union_crash-714.test diff --git a/storage/eloq/mysql-test/mono_main/t/unique.test b/storage/eloq/mysql-test/eloq_main/t/unique.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/unique.test rename to storage/eloq/mysql-test/eloq_main/t/unique.test diff --git a/storage/eloq/mysql-test/mono_main/t/unsafe_binlog_innodb.test b/storage/eloq/mysql-test/eloq_main/t/unsafe_binlog_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/unsafe_binlog_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/unsafe_binlog_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/update.test b/storage/eloq/mysql-test/eloq_main/t/update.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/update.test rename to storage/eloq/mysql-test/eloq_main/t/update.test diff --git a/storage/eloq/mysql-test/mono_main/t/update_ignore_216.test b/storage/eloq/mysql-test/eloq_main/t/update_ignore_216.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/update_ignore_216.test rename to storage/eloq/mysql-test/eloq_main/t/update_ignore_216.test diff --git a/storage/eloq/mysql-test/mono_main/t/update_innodb.test b/storage/eloq/mysql-test/eloq_main/t/update_innodb.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/update_innodb.test rename to storage/eloq/mysql-test/eloq_main/t/update_innodb.test diff --git a/storage/eloq/mysql-test/mono_main/t/update_use_source.test b/storage/eloq/mysql-test/eloq_main/t/update_use_source.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/update_use_source.test rename to storage/eloq/mysql-test/eloq_main/t/update_use_source.test diff --git a/storage/eloq/mysql-test/mono_main/t/upgrade.opt b/storage/eloq/mysql-test/eloq_main/t/upgrade.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/upgrade.opt rename to storage/eloq/mysql-test/eloq_main/t/upgrade.opt diff --git a/storage/eloq/mysql-test/mono_main/t/upgrade.test b/storage/eloq/mysql-test/eloq_main/t/upgrade.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/upgrade.test rename to storage/eloq/mysql-test/eloq_main/t/upgrade.test diff --git a/storage/eloq/mysql-test/mono_main/t/upgrade_MDEV-19650.test b/storage/eloq/mysql-test/eloq_main/t/upgrade_MDEV-19650.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/upgrade_MDEV-19650.test rename to storage/eloq/mysql-test/eloq_main/t/upgrade_MDEV-19650.test diff --git a/storage/eloq/mysql-test/mono_main/t/upgrade_MDEV-23102-1.test b/storage/eloq/mysql-test/eloq_main/t/upgrade_MDEV-23102-1.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/upgrade_MDEV-23102-1.test rename to storage/eloq/mysql-test/eloq_main/t/upgrade_MDEV-23102-1.test diff --git a/storage/eloq/mysql-test/mono_main/t/upgrade_MDEV-23102-2.test b/storage/eloq/mysql-test/eloq_main/t/upgrade_MDEV-23102-2.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/upgrade_MDEV-23102-2.test rename to storage/eloq/mysql-test/eloq_main/t/upgrade_MDEV-23102-2.test diff --git a/storage/eloq/mysql-test/mono_main/t/upgrade_mdev_24363.test b/storage/eloq/mysql-test/eloq_main/t/upgrade_mdev_24363.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/upgrade_mdev_24363.test rename to storage/eloq/mysql-test/eloq_main/t/upgrade_mdev_24363.test diff --git a/storage/eloq/mysql-test/mono_main/t/user_limits-master.opt b/storage/eloq/mysql-test/eloq_main/t/user_limits-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/user_limits-master.opt rename to storage/eloq/mysql-test/eloq_main/t/user_limits-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/user_limits.test b/storage/eloq/mysql-test/eloq_main/t/user_limits.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/user_limits.test rename to storage/eloq/mysql-test/eloq_main/t/user_limits.test diff --git a/storage/eloq/mysql-test/mono_main/t/user_var-binlog.test b/storage/eloq/mysql-test/eloq_main/t/user_var-binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/user_var-binlog.test rename to storage/eloq/mysql-test/eloq_main/t/user_var-binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/user_var.test b/storage/eloq/mysql-test/eloq_main/t/user_var.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/user_var.test rename to storage/eloq/mysql-test/eloq_main/t/user_var.test diff --git a/storage/eloq/mysql-test/mono_main/t/userstat-badlogin-4824.test b/storage/eloq/mysql-test/eloq_main/t/userstat-badlogin-4824.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/userstat-badlogin-4824.test rename to storage/eloq/mysql-test/eloq_main/t/userstat-badlogin-4824.test diff --git a/storage/eloq/mysql-test/mono_main/t/userstat.opt b/storage/eloq/mysql-test/eloq_main/t/userstat.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/userstat.opt rename to storage/eloq/mysql-test/eloq_main/t/userstat.opt diff --git a/storage/eloq/mysql-test/mono_main/t/userstat.test b/storage/eloq/mysql-test/eloq_main/t/userstat.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/userstat.test rename to storage/eloq/mysql-test/eloq_main/t/userstat.test diff --git a/storage/eloq/mysql-test/mono_main/t/varbinary.test b/storage/eloq/mysql-test/eloq_main/t/varbinary.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/varbinary.test rename to storage/eloq/mysql-test/eloq_main/t/varbinary.test diff --git a/storage/eloq/mysql-test/mono_main/t/variables-master.opt b/storage/eloq/mysql-test/eloq_main/t/variables-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/variables-master.opt rename to storage/eloq/mysql-test/eloq_main/t/variables-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/variables-notembedded-master.opt b/storage/eloq/mysql-test/eloq_main/t/variables-notembedded-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/variables-notembedded-master.opt rename to storage/eloq/mysql-test/eloq_main/t/variables-notembedded-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/variables-notembedded.test b/storage/eloq/mysql-test/eloq_main/t/variables-notembedded.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/variables-notembedded.test rename to storage/eloq/mysql-test/eloq_main/t/variables-notembedded.test diff --git a/storage/eloq/mysql-test/mono_main/t/variables.test b/storage/eloq/mysql-test/eloq_main/t/variables.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/variables.test rename to storage/eloq/mysql-test/eloq_main/t/variables.test diff --git a/storage/eloq/mysql-test/mono_main/t/variables_community.test b/storage/eloq/mysql-test/eloq_main/t/variables_community.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/variables_community.test rename to storage/eloq/mysql-test/eloq_main/t/variables_community.test diff --git a/storage/eloq/mysql-test/mono_main/t/view.test b/storage/eloq/mysql-test/eloq_main/t/view.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/view.test rename to storage/eloq/mysql-test/eloq_main/t/view.test diff --git a/storage/eloq/mysql-test/mono_main/t/view_alias.test b/storage/eloq/mysql-test/eloq_main/t/view_alias.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/view_alias.test rename to storage/eloq/mysql-test/eloq_main/t/view_alias.test diff --git a/storage/eloq/mysql-test/mono_main/t/view_debug.test b/storage/eloq/mysql-test/eloq_main/t/view_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/view_debug.test rename to storage/eloq/mysql-test/eloq_main/t/view_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/view_grant.test b/storage/eloq/mysql-test/eloq_main/t/view_grant.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/view_grant.test rename to storage/eloq/mysql-test/eloq_main/t/view_grant.test diff --git a/storage/eloq/mysql-test/mono_main/t/wait_timeout.test b/storage/eloq/mysql-test/eloq_main/t/wait_timeout.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/wait_timeout.test rename to storage/eloq/mysql-test/eloq_main/t/wait_timeout.test diff --git a/storage/eloq/mysql-test/mono_main/t/warnings-master.opt b/storage/eloq/mysql-test/eloq_main/t/warnings-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/warnings-master.opt rename to storage/eloq/mysql-test/eloq_main/t/warnings-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/warnings.test b/storage/eloq/mysql-test/eloq_main/t/warnings.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/warnings.test rename to storage/eloq/mysql-test/eloq_main/t/warnings.test diff --git a/storage/eloq/mysql-test/mono_main/t/warnings_debug.test b/storage/eloq/mysql-test/eloq_main/t/warnings_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/warnings_debug.test rename to storage/eloq/mysql-test/eloq_main/t/warnings_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/warnings_engine_disabled.test b/storage/eloq/mysql-test/eloq_main/t/warnings_engine_disabled.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/warnings_engine_disabled.test rename to storage/eloq/mysql-test/eloq_main/t/warnings_engine_disabled.test diff --git a/storage/eloq/mysql-test/mono_main/t/win.test b/storage/eloq/mysql-test/eloq_main/t/win.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win.test rename to storage/eloq/mysql-test/eloq_main/t/win.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_as_arg_to_aggregate_func.test b/storage/eloq/mysql-test/eloq_main/t/win_as_arg_to_aggregate_func.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_as_arg_to_aggregate_func.test rename to storage/eloq/mysql-test/eloq_main/t/win_as_arg_to_aggregate_func.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_avg.test b/storage/eloq/mysql-test/eloq_main/t/win_avg.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_avg.test rename to storage/eloq/mysql-test/eloq_main/t/win_avg.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_big-mdev-10092.test b/storage/eloq/mysql-test/eloq_main/t/win_big-mdev-10092.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_big-mdev-10092.test rename to storage/eloq/mysql-test/eloq_main/t/win_big-mdev-10092.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_big-mdev-11697.test b/storage/eloq/mysql-test/eloq_main/t/win_big-mdev-11697.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_big-mdev-11697.test rename to storage/eloq/mysql-test/eloq_main/t/win_big-mdev-11697.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_big.test b/storage/eloq/mysql-test/eloq_main/t/win_big.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_big.test rename to storage/eloq/mysql-test/eloq_main/t/win_big.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_bit.test b/storage/eloq/mysql-test/eloq_main/t/win_bit.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_bit.test rename to storage/eloq/mysql-test/eloq_main/t/win_bit.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_empty_over.test b/storage/eloq/mysql-test/eloq_main/t/win_empty_over.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_empty_over.test rename to storage/eloq/mysql-test/eloq_main/t/win_empty_over.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_first_last_value.test b/storage/eloq/mysql-test/eloq_main/t/win_first_last_value.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_first_last_value.test rename to storage/eloq/mysql-test/eloq_main/t/win_first_last_value.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_i_s.test b/storage/eloq/mysql-test/eloq_main/t/win_i_s.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_i_s.test rename to storage/eloq/mysql-test/eloq_main/t/win_i_s.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_insert_select.test b/storage/eloq/mysql-test/eloq_main/t/win_insert_select.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_insert_select.test rename to storage/eloq/mysql-test/eloq_main/t/win_insert_select.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_lead_lag.test b/storage/eloq/mysql-test/eloq_main/t/win_lead_lag.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_lead_lag.test rename to storage/eloq/mysql-test/eloq_main/t/win_lead_lag.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_min_max.test b/storage/eloq/mysql-test/eloq_main/t/win_min_max.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_min_max.test rename to storage/eloq/mysql-test/eloq_main/t/win_min_max.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_nth_value.test b/storage/eloq/mysql-test/eloq_main/t/win_nth_value.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_nth_value.test rename to storage/eloq/mysql-test/eloq_main/t/win_nth_value.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_ntile.test b/storage/eloq/mysql-test/eloq_main/t/win_ntile.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_ntile.test rename to storage/eloq/mysql-test/eloq_main/t/win_ntile.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_orderby.test b/storage/eloq/mysql-test/eloq_main/t/win_orderby.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_orderby.test rename to storage/eloq/mysql-test/eloq_main/t/win_orderby.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_percent_cume.test b/storage/eloq/mysql-test/eloq_main/t/win_percent_cume.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_percent_cume.test rename to storage/eloq/mysql-test/eloq_main/t/win_percent_cume.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_percentile.test b/storage/eloq/mysql-test/eloq_main/t/win_percentile.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_percentile.test rename to storage/eloq/mysql-test/eloq_main/t/win_percentile.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_rank.test b/storage/eloq/mysql-test/eloq_main/t/win_rank.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_rank.test rename to storage/eloq/mysql-test/eloq_main/t/win_rank.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_std.test b/storage/eloq/mysql-test/eloq_main/t/win_std.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_std.test rename to storage/eloq/mysql-test/eloq_main/t/win_std.test diff --git a/storage/eloq/mysql-test/mono_main/t/win_sum.test b/storage/eloq/mysql-test/eloq_main/t/win_sum.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/win_sum.test rename to storage/eloq/mysql-test/eloq_main/t/win_sum.test diff --git a/storage/eloq/mysql-test/mono_main/t/windows.test b/storage/eloq/mysql-test/eloq_main/t/windows.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/windows.test rename to storage/eloq/mysql-test/eloq_main/t/windows.test diff --git a/storage/eloq/mysql-test/mono_main/t/windows_debug.test b/storage/eloq/mysql-test/eloq_main/t/windows_debug.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/windows_debug.test rename to storage/eloq/mysql-test/eloq_main/t/windows_debug.test diff --git a/storage/eloq/mysql-test/mono_main/t/wl4435_generated.inc b/storage/eloq/mysql-test/eloq_main/t/wl4435_generated.inc similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/wl4435_generated.inc rename to storage/eloq/mysql-test/eloq_main/t/wl4435_generated.inc diff --git a/storage/eloq/mysql-test/mono_main/t/wolfssl.opt b/storage/eloq/mysql-test/eloq_main/t/wolfssl.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/wolfssl.opt rename to storage/eloq/mysql-test/eloq_main/t/wolfssl.opt diff --git a/storage/eloq/mysql-test/mono_main/t/wolfssl.test b/storage/eloq/mysql-test/eloq_main/t/wolfssl.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/wolfssl.test rename to storage/eloq/mysql-test/eloq_main/t/wolfssl.test diff --git a/storage/eloq/mysql-test/mono_main/t/xa.test b/storage/eloq/mysql-test/eloq_main/t/xa.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/xa.test rename to storage/eloq/mysql-test/eloq_main/t/xa.test diff --git a/storage/eloq/mysql-test/mono_main/t/xa_binlog.test b/storage/eloq/mysql-test/eloq_main/t/xa_binlog.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/xa_binlog.test rename to storage/eloq/mysql-test/eloq_main/t/xa_binlog.test diff --git a/storage/eloq/mysql-test/mono_main/t/xa_prepared_binlog_off-master.opt b/storage/eloq/mysql-test/eloq_main/t/xa_prepared_binlog_off-master.opt similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/xa_prepared_binlog_off-master.opt rename to storage/eloq/mysql-test/eloq_main/t/xa_prepared_binlog_off-master.opt diff --git a/storage/eloq/mysql-test/mono_main/t/xa_prepared_binlog_off.test b/storage/eloq/mysql-test/eloq_main/t/xa_prepared_binlog_off.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/xa_prepared_binlog_off.test rename to storage/eloq/mysql-test/eloq_main/t/xa_prepared_binlog_off.test diff --git a/storage/eloq/mysql-test/mono_main/t/xa_sync.test b/storage/eloq/mysql-test/eloq_main/t/xa_sync.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/xa_sync.test rename to storage/eloq/mysql-test/eloq_main/t/xa_sync.test diff --git a/storage/eloq/mysql-test/mono_main/t/xml.test b/storage/eloq/mysql-test/eloq_main/t/xml.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/xml.test rename to storage/eloq/mysql-test/eloq_main/t/xml.test diff --git a/storage/eloq/mysql-test/mono_main/t/xtradb_mrr.test b/storage/eloq/mysql-test/eloq_main/t/xtradb_mrr.test similarity index 100% rename from storage/eloq/mysql-test/mono_main/t/xtradb_mrr.test rename to storage/eloq/mysql-test/eloq_main/t/xtradb_mrr.test diff --git a/storage/eloq/mysql-test/mono_multi/disabled.def b/storage/eloq/mysql-test/eloq_multi/disabled.def similarity index 100% rename from storage/eloq/mysql-test/mono_multi/disabled.def rename to storage/eloq/mysql-test/eloq_multi/disabled.def diff --git a/storage/eloq/mysql-test/mono_multi/include/have_eloq.inc b/storage/eloq/mysql-test/eloq_multi/include/have_eloq.inc similarity index 100% rename from storage/eloq/mysql-test/mono_multi/include/have_eloq.inc rename to storage/eloq/mysql-test/eloq_multi/include/have_eloq.inc diff --git a/storage/eloq/mysql-test/mono_multi/include/have_hash_partition.inc b/storage/eloq/mysql-test/eloq_multi/include/have_hash_partition.inc similarity index 100% rename from storage/eloq/mysql-test/mono_multi/include/have_hash_partition.inc rename to storage/eloq/mysql-test/eloq_multi/include/have_hash_partition.inc diff --git a/storage/eloq/mysql-test/mono_multi/include/have_range_partition.inc b/storage/eloq/mysql-test/eloq_multi/include/have_range_partition.inc similarity index 100% rename from storage/eloq/mysql-test/mono_multi/include/have_range_partition.inc rename to storage/eloq/mysql-test/eloq_multi/include/have_range_partition.inc diff --git a/storage/eloq/mysql-test/mono_multi/include/mono_connect.inc b/storage/eloq/mysql-test/eloq_multi/include/mono_connect.inc similarity index 100% rename from storage/eloq/mysql-test/mono_multi/include/mono_connect.inc rename to storage/eloq/mysql-test/eloq_multi/include/mono_connect.inc diff --git a/storage/eloq/mysql-test/mono_multi/include/mono_connection.inc b/storage/eloq/mysql-test/eloq_multi/include/mono_connection.inc similarity index 100% rename from storage/eloq/mysql-test/mono_multi/include/mono_connection.inc rename to storage/eloq/mysql-test/eloq_multi/include/mono_connection.inc diff --git a/storage/eloq/mysql-test/mono_multi/include/mono_init.inc b/storage/eloq/mysql-test/eloq_multi/include/mono_init.inc similarity index 100% rename from storage/eloq/mysql-test/mono_multi/include/mono_init.inc rename to storage/eloq/mysql-test/eloq_multi/include/mono_init.inc diff --git a/storage/eloq/mysql-test/mono_multi/my.cnf b/storage/eloq/mysql-test/eloq_multi/my.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_multi/my.cnf rename to storage/eloq/mysql-test/eloq_multi/my.cnf diff --git a/storage/eloq/mysql-test/mono_multi/r/alter_schema_term_changed.result b/storage/eloq/mysql-test/eloq_multi/r/alter_schema_term_changed.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/alter_schema_term_changed.result rename to storage/eloq/mysql-test/eloq_multi/r/alter_schema_term_changed.result diff --git a/storage/eloq/mysql-test/mono_multi/r/alter_view.result b/storage/eloq/mysql-test/eloq_multi/r/alter_view.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/alter_view.result rename to storage/eloq/mysql-test/eloq_multi/r/alter_view.result diff --git a/storage/eloq/mysql-test/mono_multi/r/batch_pk_load.result b/storage/eloq/mysql-test/eloq_multi/r/batch_pk_load.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/batch_pk_load.result rename to storage/eloq/mysql-test/eloq_multi/r/batch_pk_load.result diff --git a/storage/eloq/mysql-test/mono_multi/r/bug172.result b/storage/eloq/mysql-test/eloq_multi/r/bug172.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/bug172.result rename to storage/eloq/mysql-test/eloq_multi/r/bug172.result diff --git a/storage/eloq/mysql-test/mono_multi/r/check_blocked_request.result b/storage/eloq/mysql-test/eloq_multi/r/check_blocked_request.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/check_blocked_request.result rename to storage/eloq/mysql-test/eloq_multi/r/check_blocked_request.result diff --git a/storage/eloq/mysql-test/mono_multi/r/create_after_drop.result b/storage/eloq/mysql-test/eloq_multi/r/create_after_drop.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/create_after_drop.result rename to storage/eloq/mysql-test/eloq_multi/r/create_after_drop.result diff --git a/storage/eloq/mysql-test/mono_multi/r/create_drop_db.result b/storage/eloq/mysql-test/eloq_multi/r/create_drop_db.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/create_drop_db.result rename to storage/eloq/mysql-test/eloq_multi/r/create_drop_db.result diff --git a/storage/eloq/mysql-test/mono_multi/r/create_drop_function.result b/storage/eloq/mysql-test/eloq_multi/r/create_drop_function.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/create_drop_function.result rename to storage/eloq/mysql-test/eloq_multi/r/create_drop_function.result diff --git a/storage/eloq/mysql-test/mono_multi/r/create_drop_index.result b/storage/eloq/mysql-test/eloq_multi/r/create_drop_index.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/create_drop_index.result rename to storage/eloq/mysql-test/eloq_multi/r/create_drop_index.result diff --git a/storage/eloq/mysql-test/mono_multi/r/create_drop_procedure.result b/storage/eloq/mysql-test/eloq_multi/r/create_drop_procedure.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/create_drop_procedure.result rename to storage/eloq/mysql-test/eloq_multi/r/create_drop_procedure.result diff --git a/storage/eloq/mysql-test/mono_multi/r/create_drop_view.result b/storage/eloq/mysql-test/eloq_multi/r/create_drop_view.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/create_drop_view.result rename to storage/eloq/mysql-test/eloq_multi/r/create_drop_view.result diff --git a/storage/eloq/mysql-test/mono_multi/r/create_table_flush_kv_fail.result b/storage/eloq/mysql-test/eloq_multi/r/create_table_flush_kv_fail.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/create_table_flush_kv_fail.result rename to storage/eloq/mysql-test/eloq_multi/r/create_table_flush_kv_fail.result diff --git a/storage/eloq/mysql-test/mono_multi/r/fault_create_drop_index.result b/storage/eloq/mysql-test/eloq_multi/r/fault_create_drop_index.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/fault_create_drop_index.result rename to storage/eloq/mysql-test/eloq_multi/r/fault_create_drop_index.result diff --git a/storage/eloq/mysql-test/mono_multi/r/fault_inject_for_upsert_1.result b/storage/eloq/mysql-test/eloq_multi/r/fault_inject_for_upsert_1.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/fault_inject_for_upsert_1.result rename to storage/eloq/mysql-test/eloq_multi/r/fault_inject_for_upsert_1.result diff --git a/storage/eloq/mysql-test/mono_multi/r/fault_inject_for_upsert_2.result b/storage/eloq/mysql-test/eloq_multi/r/fault_inject_for_upsert_2.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/fault_inject_for_upsert_2.result rename to storage/eloq/mysql-test/eloq_multi/r/fault_inject_for_upsert_2.result diff --git a/storage/eloq/mysql-test/mono_multi/r/fault_inject_for_upsert_3.result b/storage/eloq/mysql-test/eloq_multi/r/fault_inject_for_upsert_3.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/fault_inject_for_upsert_3.result rename to storage/eloq/mysql-test/eloq_multi/r/fault_inject_for_upsert_3.result diff --git a/storage/eloq/mysql-test/mono_multi/r/fault_inject_for_upsert_table.result b/storage/eloq/mysql-test/eloq_multi/r/fault_inject_for_upsert_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/fault_inject_for_upsert_table.result rename to storage/eloq/mysql-test/eloq_multi/r/fault_inject_for_upsert_table.result diff --git a/storage/eloq/mysql-test/mono_multi/r/fault_inject_term_neg_Execute.result b/storage/eloq/mysql-test/eloq_multi/r/fault_inject_term_neg_Execute.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/fault_inject_term_neg_Execute.result rename to storage/eloq/mysql-test/eloq_multi/r/fault_inject_term_neg_Execute.result diff --git a/storage/eloq/mysql-test/mono_multi/r/flush_privileges.result b/storage/eloq/mysql-test/eloq_multi/r/flush_privileges.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/flush_privileges.result rename to storage/eloq/mysql-test/eloq_multi/r/flush_privileges.result diff --git a/storage/eloq/mysql-test/mono_multi/r/improve_ckpt_flush_undo.result b/storage/eloq/mysql-test/eloq_multi/r/improve_ckpt_flush_undo.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/improve_ckpt_flush_undo.result rename to storage/eloq/mysql-test/eloq_multi/r/improve_ckpt_flush_undo.result diff --git a/storage/eloq/mysql-test/mono_multi/r/improve_ckpt_flush_undo_sk1.result b/storage/eloq/mysql-test/eloq_multi/r/improve_ckpt_flush_undo_sk1.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/improve_ckpt_flush_undo_sk1.result rename to storage/eloq/mysql-test/eloq_multi/r/improve_ckpt_flush_undo_sk1.result diff --git a/storage/eloq/mysql-test/mono_multi/r/improve_ckpt_flush_undo_sk2.result b/storage/eloq/mysql-test/eloq_multi/r/improve_ckpt_flush_undo_sk2.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/improve_ckpt_flush_undo_sk2.result rename to storage/eloq/mysql-test/eloq_multi/r/improve_ckpt_flush_undo_sk2.result diff --git a/storage/eloq/mysql-test/mono_multi/r/init_tx_failure.result b/storage/eloq/mysql-test/eloq_multi/r/init_tx_failure.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/init_tx_failure.result rename to storage/eloq/mysql-test/eloq_multi/r/init_tx_failure.result diff --git a/storage/eloq/mysql-test/mono_multi/r/m_scan_remainer_lock.result b/storage/eloq/mysql-test/eloq_multi/r/m_scan_remainer_lock.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/m_scan_remainer_lock.result rename to storage/eloq/mysql-test/eloq_multi/r/m_scan_remainer_lock.result diff --git a/storage/eloq/mysql-test/mono_multi/r/mono_auto_increment.result b/storage/eloq/mysql-test/eloq_multi/r/mono_auto_increment.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/mono_auto_increment.result rename to storage/eloq/mysql-test/eloq_multi/r/mono_auto_increment.result diff --git a/storage/eloq/mysql-test/mono_multi/r/multi_dead_lock_check.result b/storage/eloq/mysql-test/eloq_multi/r/multi_dead_lock_check.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/multi_dead_lock_check.result rename to storage/eloq/mysql-test/eloq_multi/r/multi_dead_lock_check.result diff --git a/storage/eloq/mysql-test/mono_multi/r/multi_nodes.result b/storage/eloq/mysql-test/eloq_multi/r/multi_nodes.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/multi_nodes.result rename to storage/eloq/mysql-test/eloq_multi/r/multi_nodes.result diff --git a/storage/eloq/mysql-test/mono_multi/r/range_split.result b/storage/eloq/mysql-test/eloq_multi/r/range_split.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/range_split.result rename to storage/eloq/mysql-test/eloq_multi/r/range_split.result diff --git a/storage/eloq/mysql-test/mono_multi/r/range_split_keycache.result b/storage/eloq/mysql-test/eloq_multi/r/range_split_keycache.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/range_split_keycache.result rename to storage/eloq/mysql-test/eloq_multi/r/range_split_keycache.result diff --git a/storage/eloq/mysql-test/mono_multi/r/range_split_recovery.result b/storage/eloq/mysql-test/eloq_multi/r/range_split_recovery.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/range_split_recovery.result rename to storage/eloq/mysql-test/eloq_multi/r/range_split_recovery.result diff --git a/storage/eloq/mysql-test/mono_multi/r/range_split_write_forward.result b/storage/eloq/mysql-test/eloq_multi/r/range_split_write_forward.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/range_split_write_forward.result rename to storage/eloq/mysql-test/eloq_multi/r/range_split_write_forward.result diff --git a/storage/eloq/mysql-test/mono_multi/r/read_pk_using_sk.result b/storage/eloq/mysql-test/eloq_multi/r/read_pk_using_sk.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/read_pk_using_sk.result rename to storage/eloq/mysql-test/eloq_multi/r/read_pk_using_sk.result diff --git a/storage/eloq/mysql-test/mono_multi/r/recover_committed_tx.result b/storage/eloq/mysql-test/eloq_multi/r/recover_committed_tx.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/recover_committed_tx.result rename to storage/eloq/mysql-test/eloq_multi/r/recover_committed_tx.result diff --git a/storage/eloq/mysql-test/mono_multi/r/recover_timeout.result b/storage/eloq/mysql-test/eloq_multi/r/recover_timeout.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/recover_timeout.result rename to storage/eloq/mysql-test/eloq_multi/r/recover_timeout.result diff --git a/storage/eloq/mysql-test/mono_multi/r/recover_uncommitted_tx.result b/storage/eloq/mysql-test/eloq_multi/r/recover_uncommitted_tx.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/recover_uncommitted_tx.result rename to storage/eloq/mysql-test/eloq_multi/r/recover_uncommitted_tx.result diff --git a/storage/eloq/mysql-test/mono_multi/r/temporary_table.result b/storage/eloq/mysql-test/eloq_multi/r/temporary_table.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/temporary_table.result rename to storage/eloq/mysql-test/eloq_multi/r/temporary_table.result diff --git a/storage/eloq/mysql-test/mono_multi/r/tx_timeout.result b/storage/eloq/mysql-test/eloq_multi/r/tx_timeout.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/tx_timeout.result rename to storage/eloq/mysql-test/eloq_multi/r/tx_timeout.result diff --git a/storage/eloq/mysql-test/mono_multi/r/tx_timeout_on_remote_response.result b/storage/eloq/mysql-test/eloq_multi/r/tx_timeout_on_remote_response.result similarity index 100% rename from storage/eloq/mysql-test/mono_multi/r/tx_timeout_on_remote_response.result rename to storage/eloq/mysql-test/eloq_multi/r/tx_timeout_on_remote_response.result diff --git a/storage/eloq/mysql-test/mono_multi/t/alter_schema_term_changed.test b/storage/eloq/mysql-test/eloq_multi/t/alter_schema_term_changed.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/alter_schema_term_changed.test rename to storage/eloq/mysql-test/eloq_multi/t/alter_schema_term_changed.test diff --git a/storage/eloq/mysql-test/mono_multi/t/alter_view.test b/storage/eloq/mysql-test/eloq_multi/t/alter_view.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/alter_view.test rename to storage/eloq/mysql-test/eloq_multi/t/alter_view.test diff --git a/storage/eloq/mysql-test/mono_multi/t/batch_pk_load.test b/storage/eloq/mysql-test/eloq_multi/t/batch_pk_load.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/batch_pk_load.test rename to storage/eloq/mysql-test/eloq_multi/t/batch_pk_load.test diff --git a/storage/eloq/mysql-test/mono_multi/t/bug172.test b/storage/eloq/mysql-test/eloq_multi/t/bug172.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/bug172.test rename to storage/eloq/mysql-test/eloq_multi/t/bug172.test diff --git a/storage/eloq/mysql-test/mono_multi/t/check_blocked_request.cnf b/storage/eloq/mysql-test/eloq_multi/t/check_blocked_request.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/check_blocked_request.cnf rename to storage/eloq/mysql-test/eloq_multi/t/check_blocked_request.cnf diff --git a/storage/eloq/mysql-test/mono_multi/t/check_blocked_request.test b/storage/eloq/mysql-test/eloq_multi/t/check_blocked_request.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/check_blocked_request.test rename to storage/eloq/mysql-test/eloq_multi/t/check_blocked_request.test diff --git a/storage/eloq/mysql-test/mono_multi/t/create_after_drop.test b/storage/eloq/mysql-test/eloq_multi/t/create_after_drop.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/create_after_drop.test rename to storage/eloq/mysql-test/eloq_multi/t/create_after_drop.test diff --git a/storage/eloq/mysql-test/mono_multi/t/create_drop_db.test b/storage/eloq/mysql-test/eloq_multi/t/create_drop_db.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/create_drop_db.test rename to storage/eloq/mysql-test/eloq_multi/t/create_drop_db.test diff --git a/storage/eloq/mysql-test/mono_multi/t/create_drop_function.test b/storage/eloq/mysql-test/eloq_multi/t/create_drop_function.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/create_drop_function.test rename to storage/eloq/mysql-test/eloq_multi/t/create_drop_function.test diff --git a/storage/eloq/mysql-test/mono_multi/t/create_drop_index.test b/storage/eloq/mysql-test/eloq_multi/t/create_drop_index.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/create_drop_index.test rename to storage/eloq/mysql-test/eloq_multi/t/create_drop_index.test diff --git a/storage/eloq/mysql-test/mono_multi/t/create_drop_procedure.test b/storage/eloq/mysql-test/eloq_multi/t/create_drop_procedure.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/create_drop_procedure.test rename to storage/eloq/mysql-test/eloq_multi/t/create_drop_procedure.test diff --git a/storage/eloq/mysql-test/mono_multi/t/create_drop_view.test b/storage/eloq/mysql-test/eloq_multi/t/create_drop_view.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/create_drop_view.test rename to storage/eloq/mysql-test/eloq_multi/t/create_drop_view.test diff --git a/storage/eloq/mysql-test/mono_multi/t/create_table_flush_kv_fail.test b/storage/eloq/mysql-test/eloq_multi/t/create_table_flush_kv_fail.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/create_table_flush_kv_fail.test rename to storage/eloq/mysql-test/eloq_multi/t/create_table_flush_kv_fail.test diff --git a/storage/eloq/mysql-test/mono_multi/t/fault_create_drop_index.test b/storage/eloq/mysql-test/eloq_multi/t/fault_create_drop_index.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/fault_create_drop_index.test rename to storage/eloq/mysql-test/eloq_multi/t/fault_create_drop_index.test diff --git a/storage/eloq/mysql-test/mono_multi/t/fault_inject_for_upsert_1.test b/storage/eloq/mysql-test/eloq_multi/t/fault_inject_for_upsert_1.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/fault_inject_for_upsert_1.test rename to storage/eloq/mysql-test/eloq_multi/t/fault_inject_for_upsert_1.test diff --git a/storage/eloq/mysql-test/mono_multi/t/fault_inject_for_upsert_2.test b/storage/eloq/mysql-test/eloq_multi/t/fault_inject_for_upsert_2.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/fault_inject_for_upsert_2.test rename to storage/eloq/mysql-test/eloq_multi/t/fault_inject_for_upsert_2.test diff --git a/storage/eloq/mysql-test/mono_multi/t/fault_inject_for_upsert_3.test b/storage/eloq/mysql-test/eloq_multi/t/fault_inject_for_upsert_3.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/fault_inject_for_upsert_3.test rename to storage/eloq/mysql-test/eloq_multi/t/fault_inject_for_upsert_3.test diff --git a/storage/eloq/mysql-test/mono_multi/t/fault_inject_for_upsert_table.test b/storage/eloq/mysql-test/eloq_multi/t/fault_inject_for_upsert_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/fault_inject_for_upsert_table.test rename to storage/eloq/mysql-test/eloq_multi/t/fault_inject_for_upsert_table.test diff --git a/storage/eloq/mysql-test/mono_multi/t/fault_inject_term_neg_Execute.test b/storage/eloq/mysql-test/eloq_multi/t/fault_inject_term_neg_Execute.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/fault_inject_term_neg_Execute.test rename to storage/eloq/mysql-test/eloq_multi/t/fault_inject_term_neg_Execute.test diff --git a/storage/eloq/mysql-test/mono_multi/t/flush_privileges.test b/storage/eloq/mysql-test/eloq_multi/t/flush_privileges.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/flush_privileges.test rename to storage/eloq/mysql-test/eloq_multi/t/flush_privileges.test diff --git a/storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo.cnf b/storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo.cnf rename to storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo.cnf diff --git a/storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo.test b/storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo.test rename to storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo.test diff --git a/storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo_sk1.cnf b/storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo_sk1.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo_sk1.cnf rename to storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo_sk1.cnf diff --git a/storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo_sk1.test b/storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo_sk1.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo_sk1.test rename to storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo_sk1.test diff --git a/storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo_sk2.cnf b/storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo_sk2.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo_sk2.cnf rename to storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo_sk2.cnf diff --git a/storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo_sk2.test b/storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo_sk2.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/improve_ckpt_flush_undo_sk2.test rename to storage/eloq/mysql-test/eloq_multi/t/improve_ckpt_flush_undo_sk2.test diff --git a/storage/eloq/mysql-test/mono_multi/t/init_tx_failure.test b/storage/eloq/mysql-test/eloq_multi/t/init_tx_failure.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/init_tx_failure.test rename to storage/eloq/mysql-test/eloq_multi/t/init_tx_failure.test diff --git a/storage/eloq/mysql-test/mono_multi/t/m_scan_remainer_lock.test b/storage/eloq/mysql-test/eloq_multi/t/m_scan_remainer_lock.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/m_scan_remainer_lock.test rename to storage/eloq/mysql-test/eloq_multi/t/m_scan_remainer_lock.test diff --git a/storage/eloq/mysql-test/mono_multi/t/mono_auto_increment.test b/storage/eloq/mysql-test/eloq_multi/t/mono_auto_increment.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/mono_auto_increment.test rename to storage/eloq/mysql-test/eloq_multi/t/mono_auto_increment.test diff --git a/storage/eloq/mysql-test/mono_multi/t/multi_dead_lock_check.cnf b/storage/eloq/mysql-test/eloq_multi/t/multi_dead_lock_check.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/multi_dead_lock_check.cnf rename to storage/eloq/mysql-test/eloq_multi/t/multi_dead_lock_check.cnf diff --git a/storage/eloq/mysql-test/mono_multi/t/multi_dead_lock_check.test b/storage/eloq/mysql-test/eloq_multi/t/multi_dead_lock_check.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/multi_dead_lock_check.test rename to storage/eloq/mysql-test/eloq_multi/t/multi_dead_lock_check.test diff --git a/storage/eloq/mysql-test/mono_multi/t/multi_nodes.test b/storage/eloq/mysql-test/eloq_multi/t/multi_nodes.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/multi_nodes.test rename to storage/eloq/mysql-test/eloq_multi/t/multi_nodes.test diff --git a/storage/eloq/mysql-test/mono_multi/t/range_split.test b/storage/eloq/mysql-test/eloq_multi/t/range_split.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/range_split.test rename to storage/eloq/mysql-test/eloq_multi/t/range_split.test diff --git a/storage/eloq/mysql-test/mono_multi/t/range_split_keycache.cnf b/storage/eloq/mysql-test/eloq_multi/t/range_split_keycache.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/range_split_keycache.cnf rename to storage/eloq/mysql-test/eloq_multi/t/range_split_keycache.cnf diff --git a/storage/eloq/mysql-test/mono_multi/t/range_split_keycache.test b/storage/eloq/mysql-test/eloq_multi/t/range_split_keycache.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/range_split_keycache.test rename to storage/eloq/mysql-test/eloq_multi/t/range_split_keycache.test diff --git a/storage/eloq/mysql-test/mono_multi/t/range_split_recovery.cnf b/storage/eloq/mysql-test/eloq_multi/t/range_split_recovery.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/range_split_recovery.cnf rename to storage/eloq/mysql-test/eloq_multi/t/range_split_recovery.cnf diff --git a/storage/eloq/mysql-test/mono_multi/t/range_split_recovery.test b/storage/eloq/mysql-test/eloq_multi/t/range_split_recovery.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/range_split_recovery.test rename to storage/eloq/mysql-test/eloq_multi/t/range_split_recovery.test diff --git a/storage/eloq/mysql-test/mono_multi/t/range_split_write_forward.test b/storage/eloq/mysql-test/eloq_multi/t/range_split_write_forward.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/range_split_write_forward.test rename to storage/eloq/mysql-test/eloq_multi/t/range_split_write_forward.test diff --git a/storage/eloq/mysql-test/mono_multi/t/read_pk_using_sk.test b/storage/eloq/mysql-test/eloq_multi/t/read_pk_using_sk.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/read_pk_using_sk.test rename to storage/eloq/mysql-test/eloq_multi/t/read_pk_using_sk.test diff --git a/storage/eloq/mysql-test/mono_multi/t/recover_committed_tx.test b/storage/eloq/mysql-test/eloq_multi/t/recover_committed_tx.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/recover_committed_tx.test rename to storage/eloq/mysql-test/eloq_multi/t/recover_committed_tx.test diff --git a/storage/eloq/mysql-test/mono_multi/t/recover_timeout.test b/storage/eloq/mysql-test/eloq_multi/t/recover_timeout.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/recover_timeout.test rename to storage/eloq/mysql-test/eloq_multi/t/recover_timeout.test diff --git a/storage/eloq/mysql-test/mono_multi/t/recover_uncommitted_tx.test b/storage/eloq/mysql-test/eloq_multi/t/recover_uncommitted_tx.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/recover_uncommitted_tx.test rename to storage/eloq/mysql-test/eloq_multi/t/recover_uncommitted_tx.test diff --git a/storage/eloq/mysql-test/mono_multi/t/temporary_table.test b/storage/eloq/mysql-test/eloq_multi/t/temporary_table.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/temporary_table.test rename to storage/eloq/mysql-test/eloq_multi/t/temporary_table.test diff --git a/storage/eloq/mysql-test/mono_multi/t/tx_timeout.cnf b/storage/eloq/mysql-test/eloq_multi/t/tx_timeout.cnf similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/tx_timeout.cnf rename to storage/eloq/mysql-test/eloq_multi/t/tx_timeout.cnf diff --git a/storage/eloq/mysql-test/mono_multi/t/tx_timeout.test b/storage/eloq/mysql-test/eloq_multi/t/tx_timeout.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/tx_timeout.test rename to storage/eloq/mysql-test/eloq_multi/t/tx_timeout.test diff --git a/storage/eloq/mysql-test/mono_multi/t/tx_timeout_on_remote_response.test b/storage/eloq/mysql-test/eloq_multi/t/tx_timeout_on_remote_response.test similarity index 100% rename from storage/eloq/mysql-test/mono_multi/t/tx_timeout_on_remote_response.test rename to storage/eloq/mysql-test/eloq_multi/t/tx_timeout_on_remote_response.test