From: Oystein Grovlen Date: April 18 2012 10:39am Subject: bzr push into mysql-trunk branch (oystein.grovlen:3699 to 3701) WL#6043 List-Archive: http://lists.mysql.com/commits/143539 Message-Id: <201204181039.q3IAd2aO023558@khepri24.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3701 Oystein Grovlen 2012-04-18 WL#6043 - Optimizations for InnoDB's FTS The optimization where tables rows are not accessed when only document ID and ranking score was requested, did not apply when there was no ORDER BY clause. This is fixed by this patch. The reason for the issue was that when there was no ORDER BY clause, a flag FT_SORTED was set to signal to the storage engine that it should do the sorting. This caused the optimizer to believe that the MATCH expression in the WHERE clause and the SELECT list were not equivalent. The fix is to not consider the FT_SORTED flag when considering equivalence. Activating this optimization revealed two bugs than needed to be fixed: 1. Item_func_docid needs to set const_item_cache to false to prevent the optimizer from considering this function to be constant. 2. The optimization has not been implemented to handle queries that contain a GROUP BY clause. @ sql/item_func.cc Item_func_match::eq should ignore the FT_SORTED flag when testing for equality. The results are the same regardless of sorting. @ sql/item_func.h Item_func_docid::update_used_tables() should set const_item_cache to false so it is not considered a constant. @ sql/sql_optimizer.cc Prevent the "convering FTS index" optimization from be applied when query has a GROUP BY clause. modified: sql/item_func.cc sql/item_func.h sql/sql_optimizer.cc 3700 Oystein Grovlen 2012-04-18 [merge] Merge mysql-trunk => mysql-wl6043 Adjusted to Item::name to Item::item_name renaming. removed: mysql-test/suite/rpl/t/rpl_report_port-slave.opt added: mysql-test/r/mysql_embedded_client_test.result mysql-test/r/partition_locking_4.result mysql-test/suite/binlog/r/binlog_gtid_cache.result mysql-test/suite/binlog/t/binlog_gtid_cache-master.opt mysql-test/suite/binlog/t/binlog_gtid_cache.test mysql-test/suite/innodb/r/innodb-alter-discard.result mysql-test/suite/innodb/r/innodb-index-online-delete.result mysql-test/suite/innodb/t/innodb-alter-discard.test mysql-test/suite/innodb/t/innodb-index-online-delete.test mysql-test/suite/perfschema/r/statement_digest_charset.result mysql-test/suite/perfschema/t/statement_digest_charset.test mysql-test/suite/rpl/r/rpl_parallel_change_master.result mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog-master.opt mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog-slave.opt mysql-test/suite/rpl/t/rpl_parallel_change_master-slave.opt mysql-test/suite/rpl/t/rpl_parallel_change_master.test mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog-master.opt mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog-slave.opt mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog-master.opt mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog-slave.opt mysql-test/suite/sys_vars/r/transaction_allow_batching_basic.result mysql-test/suite/sys_vars/t/transaction_allow_batching_basic.test mysql-test/t/mysql_embedded_client_test.test mysql-test/t/partition_locking_4.test modified: CMakeLists.txt cmake/build_configurations/compiler_options.cmake cmake/libutils.cmake cmd-line-utils/libedit/map.c cmd-line-utils/libedit/tty.c configure.cmake extra/yassl/src/buffer.cpp include/mysql/psi/mysql_statement.h include/mysql/psi/psi.h include/mysql/psi/psi_abi_v1.h.pp include/mysql_com.h libmysqld/CMakeLists.txt libmysqld/lib_sql.cc mysql-test/collections/default.push mysql-test/extra/rpl_tests/rpl_change_master.test mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_mixing_engines.inc mysql-test/extra/rpl_tests/rpl_mixing_engines.test mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc mysql-test/extra/rpl_tests/rpl_reset_slave.test mysql-test/extra/rpl_tests/rpl_row_basic.test mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test mysql-test/include/function_defaults.inc mysql-test/include/rpl_change_topology.inc mysql-test/include/show_events.inc mysql-test/mysql-test-run.pl mysql-test/r/alter_table.result mysql-test/r/auth_rpl.result mysql-test/r/derived.result mysql-test/r/explain.result mysql-test/r/function_defaults.result mysql-test/r/get_diagnostics.result mysql-test/r/grant.result mysql-test/r/help.result mysql-test/r/innodb_explain_json_non_select_all.result mysql-test/r/innodb_explain_json_non_select_none.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_explain_non_select_none.result mysql-test/r/myisam_explain_json_non_select_all.result mysql-test/r/myisam_explain_json_non_select_none.result mysql-test/r/myisam_explain_non_select_all.result mysql-test/r/myisam_explain_non_select_none.result mysql-test/r/partition_cache.result mysql-test/r/partition_error.result mysql-test/r/partition_exchange.result mysql-test/r/ps.result mysql-test/r/read_only_innodb.result mysql-test/r/rpl_mysqldump_slave.result mysql-test/r/show_check.result mysql-test/r/sp-destruct.result mysql-test/r/sp-threads.result mysql-test/r/sp.result mysql-test/r/tablespace.result mysql-test/r/type_time.result mysql-test/r/variables.result mysql-test/suite/binlog/r/binlog_rewrite.result mysql-test/suite/binlog/r/binlog_unsafe.result mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/engines/funcs/t/crash_manytables_number.test mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test mysql-test/suite/engines/funcs/t/se_join_cross.test mysql-test/suite/engines/funcs/t/se_join_default.test mysql-test/suite/engines/funcs/t/se_join_inner.test mysql-test/suite/engines/funcs/t/se_join_left.test mysql-test/suite/engines/funcs/t/se_join_natural_left.test mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test mysql-test/suite/engines/funcs/t/se_join_natural_right.test mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test mysql-test/suite/engines/funcs/t/se_join_right.test mysql-test/suite/engines/funcs/t/se_join_right_outer.test mysql-test/suite/engines/funcs/t/se_join_straight.test mysql-test/suite/engines/funcs/t/se_string_limit.test mysql-test/suite/engines/iuds/t/update_delete_number.test mysql-test/suite/funcs_1/datadict/processlist_priv.inc mysql-test/suite/funcs_1/datadict/processlist_val.inc mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result mysql-test/suite/funcs_1/r/processlist_priv_ps.result mysql-test/suite/funcs_1/r/processlist_val_no_prot.result mysql-test/suite/funcs_1/r/processlist_val_ps.result mysql-test/suite/innodb/r/innodb-index-online.result mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/t/innodb-index-online.test mysql-test/suite/innodb/t/innodb.test mysql-test/suite/innodb/t/innodb_bug30423.test mysql-test/suite/innodb/t/innodb_bug53290.test mysql-test/suite/innodb_fts/r/innodb_fts_misc.result mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result mysql-test/suite/innodb_fts/t/innodb_fts_misc.test mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test mysql-test/suite/opt_trace/include/general2.inc mysql-test/suite/opt_trace/r/bugs_no_prot_all.result mysql-test/suite/opt_trace/r/bugs_no_prot_none.result mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result mysql-test/suite/opt_trace/r/charset.result mysql-test/suite/opt_trace/r/eq_range_statistics.result mysql-test/suite/opt_trace/r/filesort_pq.result mysql-test/suite/opt_trace/r/general2_no_prot.result mysql-test/suite/opt_trace/r/general2_ps_prot.result mysql-test/suite/opt_trace/r/general_no_prot_all.result mysql-test/suite/opt_trace/r/general_no_prot_none.result mysql-test/suite/opt_trace/r/general_ps_prot_all.result mysql-test/suite/opt_trace/r/general_ps_prot_none.result mysql-test/suite/opt_trace/r/range_no_prot.result mysql-test/suite/opt_trace/r/range_ps_prot.result mysql-test/suite/opt_trace/r/security_no_prot.result mysql-test/suite/opt_trace/r/security_ps_prot.result mysql-test/suite/opt_trace/r/subquery_no_prot.result mysql-test/suite/opt_trace/r/subquery_ps_prot.result mysql-test/suite/opt_trace/r/temp_table.result mysql-test/suite/parts/r/partition_exch_qa_12.result mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result mysql-test/suite/parts/r/rpl_partition.result mysql-test/suite/parts/t/partition_exch_qa_12.test mysql-test/suite/parts/t/partition_float_myisam.test mysql-test/suite/perfschema/include/digest_cleanup.inc mysql-test/suite/perfschema/include/digest_execution.inc mysql-test/suite/perfschema/include/digest_setup.inc mysql-test/suite/perfschema/r/digest_table_full.result mysql-test/suite/perfschema/r/dml_setup_instruments.result mysql-test/suite/perfschema/r/relaylog.result mysql-test/suite/perfschema/r/start_server_no_digests.result mysql-test/suite/perfschema/r/statement_digest.result mysql-test/suite/perfschema/r/statement_digest_consumers.result mysql-test/suite/perfschema/r/statement_digest_consumers2.result mysql-test/suite/perfschema/r/statement_digest_long_query.result mysql-test/suite/perfschema/t/dml_setup_instruments.test mysql-test/suite/rpl/r/rpl_000010.result mysql-test/suite/rpl/r/rpl_000011.result mysql-test/suite/rpl/r/rpl_000013.result mysql-test/suite/rpl/r/rpl_000017.result mysql-test/suite/rpl/r/rpl_DML_error.result mysql-test/suite/rpl/r/rpl_EE_err.result mysql-test/suite/rpl/r/rpl_LD_INFILE.result mysql-test/suite/rpl/r/rpl_alter.result mysql-test/suite/rpl/r/rpl_alter_db.result mysql-test/suite/rpl/r/rpl_alter_repository.result mysql-test/suite/rpl/r/rpl_auto_increment.result mysql-test/suite/rpl/r/rpl_auto_increment_11932.result mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result mysql-test/suite/rpl/r/rpl_binlog_corruption.result mysql-test/suite/rpl/r/rpl_binlog_errors.result mysql-test/suite/rpl/r/rpl_binlog_grant.result mysql-test/suite/rpl/r/rpl_binlog_index.result mysql-test/suite/rpl/r/rpl_bit.result mysql-test/suite/rpl/r/rpl_bit_npk.result mysql-test/suite/rpl/r/rpl_blackhole.result mysql-test/suite/rpl/r/rpl_bug26395.result mysql-test/suite/rpl/r/rpl_bug31076.result mysql-test/suite/rpl/r/rpl_bug33931.result mysql-test/suite/rpl/r/rpl_bug37426.result mysql-test/suite/rpl/r/rpl_bug38694.result mysql-test/suite/rpl/r/rpl_bug41902.result mysql-test/suite/rpl/r/rpl_change_master.result mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result mysql-test/suite/rpl/r/rpl_change_master_dbug.result mysql-test/suite/rpl/r/rpl_charset.result mysql-test/suite/rpl/r/rpl_charset_sjis.result mysql-test/suite/rpl/r/rpl_checksum.result mysql-test/suite/rpl/r/rpl_checksum_cache.result mysql-test/suite/rpl/r/rpl_checksum_undef.result mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result mysql-test/suite/rpl/r/rpl_colSize.result mysql-test/suite/rpl/r/rpl_commit_after_flush.result mysql-test/suite/rpl/r/rpl_concurrency_error.result mysql-test/suite/rpl/r/rpl_conditional_comments.result mysql-test/suite/rpl/r/rpl_connection.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_crash_safe_master.result mysql-test/suite/rpl/r/rpl_create_database.result mysql-test/suite/rpl/r/rpl_create_if_not_exists.result mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result mysql-test/suite/rpl/r/rpl_cross_version.result mysql-test/suite/rpl/r/rpl_current_user.result mysql-test/suite/rpl/r/rpl_deadlock_innodb.result mysql-test/suite/rpl/r/rpl_delete_no_where.result mysql-test/suite/rpl/r/rpl_do_db_filter.result mysql-test/suite/rpl/r/rpl_do_grant.result mysql-test/suite/rpl/r/rpl_do_table_filter_insensitive.result mysql-test/suite/rpl/r/rpl_do_table_filter_sensitive.result mysql-test/suite/rpl/r/rpl_drop.result mysql-test/suite/rpl/r/rpl_drop_db.result mysql-test/suite/rpl/r/rpl_drop_temp.result mysql-test/suite/rpl/r/rpl_drop_view.result mysql-test/suite/rpl/r/rpl_dual_pos_advance.result mysql-test/suite/rpl/r/rpl_empty_master_host.result mysql-test/suite/rpl/r/rpl_err_ignoredtable.result mysql-test/suite/rpl/r/rpl_events.result mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result mysql-test/suite/rpl/r/rpl_failed_optimize.result mysql-test/suite/rpl/r/rpl_filter_database.result mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result mysql-test/suite/rpl/r/rpl_flush_logs.result mysql-test/suite/rpl/r/rpl_flushlog_loop.result mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result mysql-test/suite/rpl/r/rpl_free_items.result mysql-test/suite/rpl/r/rpl_function_defaults.result mysql-test/suite/rpl/r/rpl_general_log.result mysql-test/suite/rpl/r/rpl_geometry.result mysql-test/suite/rpl/r/rpl_get_lock.result mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result mysql-test/suite/rpl/r/rpl_grant.result mysql-test/suite/rpl/r/rpl_grant_plugin.result mysql-test/suite/rpl/r/rpl_gtid_empty_group.result mysql-test/suite/rpl/r/rpl_gtid_execution.result mysql-test/suite/rpl/r/rpl_gtid_failover.result mysql-test/suite/rpl/r/rpl_gtid_lost_fail_to_connect.result mysql-test/suite/rpl/r/rpl_gtid_lost_maintained.result mysql-test/suite/rpl/r/rpl_gtid_mode.result mysql-test/suite/rpl/r/rpl_gtid_parallel.result mysql-test/suite/rpl/r/rpl_gtid_sql_until_before_after.result mysql-test/suite/rpl/r/rpl_heartbeat.result mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result mysql-test/suite/rpl/r/rpl_idempotency.result mysql-test/suite/rpl/r/rpl_ignore_db_filter.result mysql-test/suite/rpl/r/rpl_ignore_grant.result mysql-test/suite/rpl/r/rpl_ignore_revoke.result mysql-test/suite/rpl/r/rpl_ignore_table.result mysql-test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result mysql-test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result mysql-test/suite/rpl/r/rpl_ignore_table_update.result mysql-test/suite/rpl/r/rpl_incident.result mysql-test/suite/rpl/r/rpl_init_slave.result mysql-test/suite/rpl/r/rpl_init_slave_errors.result mysql-test/suite/rpl/r/rpl_innodb_bug28430.result mysql-test/suite/rpl/r/rpl_innodb_bug30888.result mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result mysql-test/suite/rpl/r/rpl_insert.result mysql-test/suite/rpl/r/rpl_insert_id.result mysql-test/suite/rpl/r/rpl_insert_id_pk.result mysql-test/suite/rpl/r/rpl_insert_ignore.result mysql-test/suite/rpl/r/rpl_invoked_features.result mysql-test/suite/rpl/r/rpl_ip_mix.result mysql-test/suite/rpl/r/rpl_ip_mix2.result mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result mysql-test/suite/rpl/r/rpl_ipv6.result mysql-test/suite/rpl/r/rpl_killed_ddl.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/r/rpl_lcase_tblnames_rewrite_db.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_loaddata_charset.result mysql-test/suite/rpl/r/rpl_loaddata_fatal.result mysql-test/suite/rpl/r/rpl_loaddata_m.result mysql-test/suite/rpl/r/rpl_loaddata_map.result mysql-test/suite/rpl/r/rpl_loaddata_s.result mysql-test/suite/rpl/r/rpl_loaddata_simple.result mysql-test/suite/rpl/r/rpl_loaddata_symlink.result mysql-test/suite/rpl/r/rpl_loaddatalocal.result mysql-test/suite/rpl/r/rpl_loadfile.result mysql-test/suite/rpl/r/rpl_locale.result mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_manual_change_index_file.result mysql-test/suite/rpl/r/rpl_many_optimize.result mysql-test/suite/rpl/r/rpl_master_connection.result mysql-test/suite/rpl/r/rpl_master_pos_wait.result mysql-test/suite/rpl/r/rpl_migration_crash_safe.result mysql-test/suite/rpl/r/rpl_misc_functions.result mysql-test/suite/rpl/r/rpl_mix_found_rows.result mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result mysql-test/suite/rpl/r/rpl_mts_debug.result mysql-test/suite/rpl/r/rpl_multi_delete.result mysql-test/suite/rpl/r/rpl_multi_delete2.result mysql-test/suite/rpl/r/rpl_multi_engine.result mysql-test/suite/rpl/r/rpl_multi_update.result mysql-test/suite/rpl/r/rpl_multi_update2.result mysql-test/suite/rpl/r/rpl_multi_update3.result mysql-test/suite/rpl/r/rpl_multi_update4.result mysql-test/suite/rpl/r/rpl_mysql_upgrade.result mysql-test/suite/rpl/r/rpl_mysqlbinlog_gtid_on.result mysql-test/suite/rpl/r/rpl_name_const.result mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result mysql-test/suite/rpl/r/rpl_not_null_innodb.result mysql-test/suite/rpl/r/rpl_not_null_myisam.result mysql-test/suite/rpl/r/rpl_optimize.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_parallel.result mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result mysql-test/suite/rpl/r/rpl_parallel_conflicts.result mysql-test/suite/rpl/r/rpl_parallel_ddl.result mysql-test/suite/rpl/r/rpl_parallel_innodb.result mysql-test/suite/rpl/r/rpl_parallel_load_data.result mysql-test/suite/rpl/r/rpl_parallel_multi_db.result mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result mysql-test/suite/rpl/r/rpl_parallel_start_stop.result mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result mysql-test/suite/rpl/r/rpl_parallel_temp_query.result mysql-test/suite/rpl/r/rpl_partition_archive.result mysql-test/suite/rpl/r/rpl_partition_innodb.result mysql-test/suite/rpl/r/rpl_partition_memory.result mysql-test/suite/rpl/r/rpl_partition_myisam.result mysql-test/suite/rpl/r/rpl_plugin_load.result mysql-test/suite/rpl/r/rpl_ps.result mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result mysql-test/suite/rpl/r/rpl_read_only.result mysql-test/suite/rpl/r/rpl_relay_space_innodb.result mysql-test/suite/rpl/r/rpl_relay_space_myisam.result mysql-test/suite/rpl/r/rpl_relayrotate.result mysql-test/suite/rpl/r/rpl_relayspace.result mysql-test/suite/rpl/r/rpl_replicate_do.result mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result mysql-test/suite/rpl/r/rpl_report.result mysql-test/suite/rpl/r/rpl_report_port.result mysql-test/suite/rpl/r/rpl_rewrite_db_filter.result mysql-test/suite/rpl/r/rpl_rewrt_db.result mysql-test/suite/rpl/r/rpl_rotate_logs.result mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result mysql-test/suite/rpl/r/rpl_row_001.result mysql-test/suite/rpl/r/rpl_row_4_bytes.result mysql-test/suite/rpl/r/rpl_row_NOW.result mysql-test/suite/rpl/r/rpl_row_USER.result mysql-test/suite/rpl/r/rpl_row_UUID.result mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result mysql-test/suite/rpl/r/rpl_row_basic_8partition.result mysql-test/suite/rpl/r/rpl_row_basic_allow_batching.result mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_row_blob_innodb.result mysql-test/suite/rpl/r/rpl_row_blob_myisam.result mysql-test/suite/rpl/r/rpl_row_colSize.result mysql-test/suite/rpl/r/rpl_row_conflicts.result mysql-test/suite/rpl/r/rpl_row_corruption.result mysql-test/suite/rpl/r/rpl_row_crash_safe.result mysql-test/suite/rpl/r/rpl_row_delayed_ins.result mysql-test/suite/rpl/r/rpl_row_drop.result mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_row_event_max_size.result mysql-test/suite/rpl/r/rpl_row_find_row.result mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result mysql-test/suite/rpl/r/rpl_row_func001.result mysql-test/suite/rpl/r/rpl_row_func002.result mysql-test/suite/rpl/r/rpl_row_func003.result mysql-test/suite/rpl/r/rpl_row_idempotency.result mysql-test/suite/rpl/r/rpl_row_ignorable_event.result mysql-test/suite/rpl/r/rpl_row_img_blobs.result mysql-test/suite/rpl/r/rpl_row_img_eng_full.result mysql-test/suite/rpl/r/rpl_row_img_eng_min.result mysql-test/suite/rpl/r/rpl_row_img_eng_noblob.result mysql-test/suite/rpl/r/rpl_row_img_idx_full.result mysql-test/suite/rpl/r/rpl_row_img_idx_min.result mysql-test/suite/rpl/r/rpl_row_img_idx_noblob.result mysql-test/suite/rpl/r/rpl_row_img_misc.result mysql-test/suite/rpl/r/rpl_row_img_sanity.result mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result mysql-test/suite/rpl/r/rpl_row_insert_delayed.result mysql-test/suite/rpl/r/rpl_row_lcase_tblnames.result mysql-test/suite/rpl/r/rpl_row_log.result mysql-test/suite/rpl/r/rpl_row_log_innodb.result mysql-test/suite/rpl/r/rpl_row_max_relay_size.result mysql-test/suite/rpl/r/rpl_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result mysql-test/suite/rpl/r/rpl_row_rec_comp_innodb.result mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result mysql-test/suite/rpl/r/rpl_row_record_find_myisam.result mysql-test/suite/rpl/r/rpl_row_reset_slave.result mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result mysql-test/suite/rpl/r/rpl_row_sp001.result mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result mysql-test/suite/rpl/r/rpl_row_sp003.result mysql-test/suite/rpl/r/rpl_row_sp005.result mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result mysql-test/suite/rpl/r/rpl_row_sp008.result mysql-test/suite/rpl/r/rpl_row_sp009.result mysql-test/suite/rpl/r/rpl_row_sp010.result mysql-test/suite/rpl/r/rpl_row_sp011.result mysql-test/suite/rpl/r/rpl_row_sp012.result mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result mysql-test/suite/rpl/r/rpl_row_trig001.result mysql-test/suite/rpl/r/rpl_row_trig002.result mysql-test/suite/rpl/r/rpl_row_trig003.result mysql-test/suite/rpl/r/rpl_row_trig004.result mysql-test/suite/rpl/r/rpl_row_trunc_temp.result mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result mysql-test/suite/rpl/r/rpl_row_utf16.result mysql-test/suite/rpl/r/rpl_row_utf32.result mysql-test/suite/rpl/r/rpl_row_view01.result mysql-test/suite/rpl/r/rpl_row_wide_table.result mysql-test/suite/rpl/r/rpl_savepoint.result mysql-test/suite/rpl/r/rpl_seconds_behind_master.result mysql-test/suite/rpl/r/rpl_semi_sync.result mysql-test/suite/rpl/r/rpl_semi_sync_event.result mysql-test/suite/rpl/r/rpl_sequential.result mysql-test/suite/rpl/r/rpl_server_id1.result mysql-test/suite/rpl/r/rpl_server_id2.result mysql-test/suite/rpl/r/rpl_server_id_ignore.result mysql-test/suite/rpl/r/rpl_server_uuid.result mysql-test/suite/rpl/r/rpl_session_var.result mysql-test/suite/rpl/r/rpl_set_charset.result mysql-test/suite/rpl/r/rpl_set_null_innodb.result mysql-test/suite/rpl/r/rpl_set_null_myisam.result mysql-test/suite/rpl/r/rpl_show_errors.result mysql-test/suite/rpl/r/rpl_show_master_info_file.result mysql-test/suite/rpl/r/rpl_show_slave_hosts.result mysql-test/suite/rpl/r/rpl_show_slave_running.result mysql-test/suite/rpl/r/rpl_skip_ddl_errors_cli.result mysql-test/suite/rpl/r/rpl_skip_error.result mysql-test/suite/rpl/r/rpl_skip_incident.result mysql-test/suite/rpl/r/rpl_slave_grp_exec.result mysql-test/suite/rpl/r/rpl_slave_load_in.result mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result mysql-test/suite/rpl/r/rpl_slave_skip.result mysql-test/suite/rpl/r/rpl_slave_start.result mysql-test/suite/rpl/r/rpl_slave_status.result mysql-test/suite/rpl/r/rpl_slow_query_log.result mysql-test/suite/rpl/r/rpl_sp.result mysql-test/suite/rpl/r/rpl_sp004.result mysql-test/suite/rpl/r/rpl_sp_effects.result mysql-test/suite/rpl/r/rpl_spec_variables.result mysql-test/suite/rpl/r/rpl_sporadic_master.result mysql-test/suite/rpl/r/rpl_ssl.result mysql-test/suite/rpl/r/rpl_ssl1.result mysql-test/suite/rpl/r/rpl_stm_000001.result mysql-test/suite/rpl/r/rpl_stm_EE_err2.result mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_conflicts.result mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result mysql-test/suite/rpl/r/rpl_stm_found_rows.result mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_stm_innodb.result mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result mysql-test/suite/rpl/r/rpl_stm_lcase_tblnames.result mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result mysql-test/suite/rpl/r/rpl_stm_loadfile.result mysql-test/suite/rpl/r/rpl_stm_log.result mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_multi_query.result mysql-test/suite/rpl/r/rpl_stm_no_op.result mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result mysql-test/suite/rpl/r/rpl_stm_reset_slave.result mysql-test/suite/rpl/r/rpl_stm_sql_mode.result mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result mysql-test/suite/rpl/r/rpl_stm_user_variables.result mysql-test/suite/rpl/r/rpl_stop_slave.result mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result mysql-test/suite/rpl/r/rpl_sync.result mysql-test/suite/rpl/r/rpl_temp_table.result mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result mysql-test/suite/rpl/r/rpl_temporal_fractional.result mysql-test/suite/rpl/r/rpl_temporary.result mysql-test/suite/rpl/r/rpl_temporary_errors.result mysql-test/suite/rpl/r/rpl_test_framework.result mysql-test/suite/rpl/r/rpl_timezone.result mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result mysql-test/suite/rpl/r/rpl_trigger.result mysql-test/suite/rpl/r/rpl_trunc_temp.result mysql-test/suite/rpl/r/rpl_truncate_2myisam.result mysql-test/suite/rpl/r/rpl_truncate_3innodb.result mysql-test/suite/rpl/r/rpl_typeconv.result mysql-test/suite/rpl/r/rpl_typeconv_innodb.result mysql-test/suite/rpl/r/rpl_udf.result mysql-test/suite/rpl/r/rpl_user.result mysql-test/suite/rpl/r/rpl_user_variables.result mysql-test/suite/rpl/r/rpl_variables.result mysql-test/suite/rpl/r/rpl_variables_stm.result mysql-test/suite/rpl/r/rpl_view.result mysql-test/suite/rpl/r/rpl_view_multi.result mysql-test/suite/rpl/t/rpl_alter_repository.test mysql-test/suite/rpl/t/rpl_binlog_index.test mysql-test/suite/rpl/t/rpl_bug33931.test mysql-test/suite/rpl/t/rpl_change_master.test mysql-test/suite/rpl/t/rpl_checksum.test mysql-test/suite/rpl/t/rpl_connection.test mysql-test/suite/rpl/t/rpl_corruption.test mysql-test/suite/rpl/t/rpl_gtid_mode.test mysql-test/suite/rpl/t/rpl_heartbeat.test mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test mysql-test/suite/rpl/t/rpl_heartbeat_basic.test mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test mysql-test/suite/rpl/t/rpl_innodb_bug28430.test mysql-test/suite/rpl/t/rpl_ip_mix.test mysql-test/suite/rpl/t/rpl_ip_mix2.test mysql-test/suite/rpl/t/rpl_ipv4_as_ipv6.test mysql-test/suite/rpl/t/rpl_ipv6.test mysql-test/suite/rpl/t/rpl_master_connection.test mysql-test/suite/rpl/t/rpl_master_pos_wait.test mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test mysql-test/suite/rpl/t/rpl_mts_debug.test mysql-test/suite/rpl/t/rpl_parallel_innodb.test mysql-test/suite/rpl/t/rpl_parallel_start_stop.test mysql-test/suite/rpl/t/rpl_report_port.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test mysql-test/suite/rpl/t/rpl_row_crash_safe.test mysql-test/suite/rpl/t/rpl_row_img_blobs.test mysql-test/suite/rpl/t/rpl_row_img_eng_full.test mysql-test/suite/rpl/t/rpl_row_img_idx_full.test mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test mysql-test/suite/rpl/t/rpl_semi_sync.test mysql-test/suite/rpl/t/rpl_server_id_ignore.test mysql-test/suite/rpl/t/rpl_server_uuid.test mysql-test/suite/rpl/t/rpl_show_slave_hosts.test mysql-test/suite/rpl/t/rpl_slave_status.test mysql-test/suite/rpl/t/rpl_ssl.test mysql-test/suite/rpl/t/rpl_ssl1.test mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test mysql-test/suite/rpl/t/rpl_stm_until.test mysql-test/suite/rpl/t/rpl_stop_slave.test mysql-test/suite/rpl/t/rpl_typeconv.test mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result mysql-test/suite/sys_vars/r/relay_log_basename_basic.result mysql-test/suite/sys_vars/r/relay_log_index_basic.result mysql-test/suite/sys_vars/r/relay_log_recovery_basic.result mysql-test/suite/sys_vars/r/rpl_init_slave_func.result mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test mysql-test/suite/sys_vars/t/relay_log_recovery_basic.test mysql-test/t/alter_table.test mysql-test/t/auth_rpl.test mysql-test/t/derived.test mysql-test/t/disabled.def mysql-test/t/grant.test mysql-test/t/help.test mysql-test/t/index_merge_innodb.test mysql-test/t/innodb_explain_json_non_select_all.test mysql-test/t/innodb_explain_non_select_all.test mysql-test/t/innodb_explain_non_select_none.test mysql-test/t/mysql_client_test_embedded.test mysql-test/t/partition_cache.test mysql-test/t/partition_exchange.test mysql-test/t/ps.test mysql-test/t/show_check.test mysql-test/t/sp-threads.test mysql-test/t/sp.test mysql-test/t/tablespace.test mysys/lf_alloc-pin.c mysys/psi_noop.c plugin/innodb_memcached/daemon_memcached/daemon/memcached.c plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.cc plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.h sql/CMakeLists.txt sql/binlog.cc sql/event_scheduler.cc sql/field.cc sql/field.h sql/field_conv.cc sql/global_threads.h sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_create.cc sql/item_func.cc sql/item_func.h sql/item_geofunc.cc sql/item_strfunc.cc sql/item_strfunc.h sql/item_subselect.cc sql/item_sum.cc sql/item_timefunc.h sql/item_xmlfunc.cc sql/lex.h sql/log.h sql/log_event.cc sql/md5.cc sql/mysqld.cc sql/mysqld.h sql/opt_explain_json.cc sql/opt_trace.cc sql/opt_trace2server.cc sql/partition_info.cc sql/procedure.cc sql/procedure.h sql/rpl_info_dummy.cc sql/rpl_info_dummy.h sql/rpl_info_factory.cc sql/rpl_info_factory.h sql/rpl_info_file.cc sql/rpl_info_file.h sql/rpl_info_handler.h sql/rpl_info_table.cc sql/rpl_info_table.h sql/rpl_master.cc sql/rpl_mi.cc sql/rpl_rli.cc sql/rpl_rli.h sql/rpl_rli_pdb.cc sql/rpl_rli_pdb.h sql/rpl_slave.cc sql/rpl_slave.h sql/scheduler.cc sql/share/errmsg-utf8.txt sql/signal_handler.cc sql/sp_head.cc sql/sql_acl.cc sql/sql_analyse.cc sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_derived.cc sql/sql_executor.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_optimizer.cc sql/sql_optimizer.h sql/sql_parse.cc sql/sql_parse.h sql/sql_partition_admin.cc sql/sql_planner.cc sql/sql_plugin.cc sql/sql_profile.cc sql/sql_reload.cc sql/sql_resolver.cc sql/sql_show.cc sql/sql_show.h sql/sql_string.h sql/sql_table.cc sql/sql_test.cc sql/sql_tmp_table.cc sql/sql_update.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/table.h sql/unireg.cc storage/example/ha_example.cc storage/innobase/api/api0api.cc storage/innobase/api/api0misc.cc storage/innobase/btr/btr0btr.cc storage/innobase/btr/btr0cur.cc storage/innobase/buf/buf0buf.cc storage/innobase/buf/buf0dump.cc storage/innobase/buf/buf0rea.cc storage/innobase/dict/dict0boot.cc storage/innobase/dict/dict0crea.cc storage/innobase/dict/dict0dict.cc storage/innobase/dict/dict0load.cc storage/innobase/dict/dict0stats.cc storage/innobase/fil/fil0fil.cc storage/innobase/fts/fts0ast.cc storage/innobase/fts/fts0blex.cc storage/innobase/fts/fts0blex.l storage/innobase/fts/fts0config.cc storage/innobase/fts/fts0fts.cc storage/innobase/fts/fts0opt.cc storage/innobase/fts/fts0que.cc storage/innobase/fts/fts0sql.cc storage/innobase/fts/fts0tlex.cc storage/innobase/fts/fts0tlex.l storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/ibuf/ibuf0ibuf.cc storage/innobase/include/api0api.h storage/innobase/include/api0misc.h storage/innobase/include/btr0cur.h storage/innobase/include/buf0buf.h storage/innobase/include/buf0types.h storage/innobase/include/data0data.h storage/innobase/include/data0data.ic storage/innobase/include/db0err.h storage/innobase/include/dict0crea.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0load.h storage/innobase/include/dict0stats.h storage/innobase/include/fil0fil.h storage/innobase/include/fts0ast.h storage/innobase/include/fts0fts.h storage/innobase/include/fts0priv.h storage/innobase/include/fts0types.h storage/innobase/include/ha_prototypes.h storage/innobase/include/lock0lock.h storage/innobase/include/log0recv.h storage/innobase/include/que0que.h storage/innobase/include/read0read.h storage/innobase/include/read0read.ic storage/innobase/include/rem0rec.h storage/innobase/include/rem0rec.ic storage/innobase/include/row0ftsort.h storage/innobase/include/row0ins.h storage/innobase/include/row0log.h storage/innobase/include/row0merge.h storage/innobase/include/row0mysql.h storage/innobase/include/row0sel.h storage/innobase/include/row0uins.h storage/innobase/include/row0umod.h storage/innobase/include/row0upd.h storage/innobase/include/row0vers.h storage/innobase/include/srv0srv.h storage/innobase/include/srv0start.h storage/innobase/include/trx0rec.h storage/innobase/include/trx0roll.h storage/innobase/include/trx0sys.h storage/innobase/include/trx0trx.h storage/innobase/include/trx0undo.h storage/innobase/include/ut0ut.h storage/innobase/include/ut0vec.ic storage/innobase/lock/lock0lock.cc storage/innobase/log/log0recv.cc storage/innobase/os/os0file.cc storage/innobase/que/que0que.cc storage/innobase/rem/rem0rec.cc storage/innobase/row/row0ftsort.cc storage/innobase/row/row0ins.cc storage/innobase/row/row0log.cc storage/innobase/row/row0merge.cc storage/innobase/row/row0mysql.cc storage/innobase/row/row0purge.cc storage/innobase/row/row0sel.cc storage/innobase/row/row0uins.cc storage/innobase/row/row0umod.cc storage/innobase/row/row0undo.cc storage/innobase/row/row0upd.cc storage/innobase/row/row0vers.cc storage/innobase/srv/srv0conc.cc storage/innobase/srv/srv0srv.cc storage/innobase/srv/srv0start.cc storage/innobase/trx/trx0i_s.cc storage/innobase/trx/trx0rec.cc storage/innobase/trx/trx0roll.cc storage/innobase/trx/trx0sys.cc storage/innobase/trx/trx0trx.cc storage/innobase/trx/trx0undo.cc storage/innobase/ut/ut0ut.cc storage/myisam/ha_myisam.cc storage/ndb/compile-cluster storage/perfschema/pfs.cc storage/perfschema/pfs_check.cc storage/perfschema/pfs_digest.cc storage/perfschema/pfs_digest.h storage/perfschema/pfs_instr.cc strings/ctype-uca.c unittest/gunit/alignment-t.cc unittest/gunit/fake_table.h unittest/gunit/field-t.cc unittest/gunit/field_timestamp-t.cc 3699 Oystein Grovlen 2012-03-30 WL#6043 - Optimizations for InnoDB's FTS Additonal tests with queries with other modes than default NATURAL LANGUAGE MODE. @ mysql-test/suite/innodb_fts/r/innodb_fts_opt.result More test cases @ mysql-test/suite/innodb_fts/t/innodb_fts_opt.test More test cases modified: mysql-test/suite/innodb_fts/r/innodb_fts_opt.result mysql-test/suite/innodb_fts/t/innodb_fts_opt.test Diff too large for email (98988 lines, the limit is 10000). No bundle (reason: useless for push emails).