Sergei Golubchik 76f0b94bb0 merge with 5.3 ... sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup		2011-10-19 21:45:18 +02:00
..
add_anonymous_users.inc
analyze-sync_with_master.test
analyze-timeout.test
assert.inc
begin_include_file.inc
big_test.inc
binlog_inject_error.inc
binlog_start_pos.inc	Backport MySQL WL#2540 into MariaDB.	2011-05-03 14:01:11 +02:00
bug38347.inc
check-testcase.test
check-warnings.test
check_concurrent_insert.inc
check_events_off.inc
check_ftwrl_compatible.inc
check_ftwrl_incompatible.inc
check_ipv6.inc
check_key_reads.inc
check_key_req.inc
check_no_concurrent_insert.inc
check_no_row_lock.inc
check_shared_row_lock.inc
check_slave_is_running.inc
check_slave_no_error.inc
check_slave_param.inc
check_var_limit.inc
cleanup_fake_relay_log.inc
commit.inc	merge mysql-5.1 --> mysql-5.5	2011-01-31 13:11:05 +00:00
common-tests.inc
concurrent.inc
connect2.inc
count_sessions.inc
ctype_8bit.inc
ctype_common.inc
ctype_czech.inc
ctype_datetime.inc
ctype_filesort.inc
ctype_filesort2.inc
ctype_german.inc
ctype_innodb_like.inc
ctype_like.inc
ctype_like_escape.inc
ctype_like_ignorable.inc
ctype_like_range_f1f2.inc
ctype_numconv.inc	5.5-merge	2011-07-02 22:08:51 +02:00
ctype_regex.inc
ctype_utf8_table.inc
ctype_utf8mb4.inc
ddl_i18n.check_events.inc
ddl_i18n.check_sp.inc	merge with 5.3	2011-10-19 21:45:18 +02:00
ddl_i18n.check_triggers.inc
ddl_i18n.check_views.inc
deadlock.inc
default_client.cnf	post-merge fixes.	2011-07-02 22:12:12 +02:00
default_my.cnf
default_mysqld.cnf	use PSI wrappers in aria and other non-MySQL code	2011-07-13 21:10:18 +02:00
default_ndbd.cnf
delete_anonymous_users.inc
diff_tables.inc	merge with 5.3	2011-10-19 21:45:18 +02:00
end_include_file.inc
endspace.inc
file_does_not_exist.inc
force_restart.inc
force_restart_if_skipped.inc
get_binlog_dump_thread_id.inc
get_relay_log_pos.inc	Merge with MySQL 5.1.55	2011-02-20 18:51:43 +02:00
gis_generic.inc
gis_keys.inc	Fix for bug #58650 "Failing assertion: primary_key_no == -1 ||	2011-02-02 16:17:48 +03:00
grant_cache.inc
have_32bit.inc
have_64bit.inc
have_archive.inc
have_archive.opt
have_archive_plugin.inc	5.5-merge	2011-07-02 22:08:51 +02:00
have_big5.inc
have_binlog_checksum_off.inc	Backport MySQL WL#2540 into MariaDB.	2011-05-03 14:01:11 +02:00
have_binlog_format_mixed.inc	skipped tests: improve skip messages, move to a proper suite, disable as needed	2011-07-16 09:59:04 +02:00
have_binlog_format_mixed.opt
have_binlog_format_mixed_or_row.inc	skipped tests: improve skip messages, move to a proper suite, disable as needed	2011-07-16 09:59:04 +02:00
have_binlog_format_mixed_or_statement.inc	skipped tests: improve skip messages, move to a proper suite, disable as needed	2011-07-16 09:59:04 +02:00
have_binlog_format_row.inc	skipped tests: improve skip messages, move to a proper suite, disable as needed	2011-07-16 09:59:04 +02:00
have_binlog_format_row.opt
have_binlog_format_row_or_statement.inc	skipped tests: improve skip messages, move to a proper suite, disable as needed	2011-07-16 09:59:04 +02:00
have_binlog_format_statement.inc	skipped tests: improve skip messages, move to a proper suite, disable as needed	2011-07-16 09:59:04 +02:00
have_binlog_format_statement.opt
have_blackhole.inc
have_blackhole.opt
have_blackhole_plugin.inc	5.5-merge	2011-07-02 22:08:51 +02:00
have_case_insensitive_file_system.inc
have_case_insensitive_fs.inc
have_case_sensitive_file_system.inc
have_collation.inc
have_compress.inc
have_cp866.inc
have_cp932.inc
have_cp1250_ch.inc
have_cp1251.inc
have_crypt.inc
have_csv.inc
have_dbi_dbd-mysql.inc	Fix for Bug#56817 - mysqlhotcopy tests fail when DBI and DBD-mysql perl modules are not found	2011-01-29 12:38:36 +01:00
have_debug.inc
have_debug_sync.inc
have_eucjpms.inc
have_euckr.inc
have_example_plugin.inc	5.5-merge	2011-07-02 22:08:51 +02:00
have_federated_plugin.inc
have_gb2312.inc
have_gbk.inc
have_geometry.inc
have_innodb.inc
have_innodb.opt	merge with xtradb-5.5.15	2011-07-18 23:04:24 +02:00
have_ipv4_mapped.inc
have_koi8r.inc
have_latin2_ch.inc
have_local_infile.inc
have_log_bin-master.opt
have_log_bin-slave.opt
have_log_bin.inc
have_lowercase0.inc
have_lowercase1.inc
have_lowercase2.inc
have_maria.inc
have_multi_ndb.inc
have_mysql_upgrade.inc
have_ndb.inc	Merge with MySQL 5.1.55	2011-02-20 18:51:43 +02:00
have_ndb_extra.inc
have_ndbapi_examples.inc
have_nodebug.inc
have_not_innodb_plugin.inc
have_outfile.inc
have_partition.inc
have_pbxt.inc
have_pbxt.opt
have_perfschema.inc
have_plugin_auth.inc	Bug #11766854 addendum :	2011-03-18 10:31:39 +01:00
have_plugin_interface.inc
have_plugin_server.inc
have_pool_of_threads.inc
have_profiling.inc
have_query_cache.inc
have_semisync_plugin.inc	5.5-merge	2011-07-02 22:08:51 +02:00
have_simple_parser.inc	5.5-merge	2011-07-02 22:08:51 +02:00
have_sjis.inc
have_ssl.inc
have_ssl_communication.inc
have_ssl_crypto_functs.inc
have_symlink.inc
have_tis620.inc
have_ucs2.inc
have_udf.inc	5.5-merge	2011-07-02 22:08:51 +02:00
have_ujis.inc
have_utf8.inc
have_utf8mb4.inc
have_utf16.inc
have_utf32.inc
have_working_dns.inc
have_xtradb.inc	merge with xtradb-5.5.15	2011-07-18 23:04:24 +02:00
have_xtradb.opt
icp_tests.inc	BUG#778434 Wrong result with in_to_exists=on in maria-5.3-mwl89	2011-07-14 17:44:37 +04:00
implicit_commit_helper.inc
index_merge1.inc	merge with 5.3	2011-10-19 21:45:18 +02:00
index_merge2.inc	merge with 5.3	2011-10-19 21:45:18 +02:00
index_merge_2sweeps.inc
index_merge_ror.inc	post-merge fixes.	2011-07-02 22:12:12 +02:00
index_merge_ror_cpk.inc
innodb-index.inc
innodb_rollback_on_timeout.inc
innodb_trx_weight.inc
io_thd_fault_injection.inc
ipv6.inc
ipv6_clients.inc	maria suite ok	2011-07-15 09:09:33 +02:00
is_embedded.inc
kill_query.inc
kill_query_and_diff_master_slave.inc
linux_sys_vars.inc
load_sysvars.inc
loaddata_autocom.inc
long_test.inc
maria_empty_logs.inc
maria_make_snapshot.inc
maria_make_snapshot_for_comparison.inc	LP686006 : maria recovery tests fail.	2011-03-30 21:26:31 +02:00
maria_make_snapshot_for_feeding_recovery.inc	LP686006 : maria recovery tests fail.	2011-03-30 21:26:31 +02:00
maria_verify_recovery.inc
master-slave.inc
min_null_cond.inc
mix1.inc	merge with 5.3	2011-10-19 21:45:18 +02:00
mix2.inc
mix2_ucs2.inc
mrr_tests.inc
mtr_check.sql	5.5-merge	2011-07-02 22:08:51 +02:00
mtr_warnings.sql	merge with 5.3	2011-10-19 21:45:18 +02:00
mysql_upgrade_preparation.inc
mysqladmin_shutdown.inc	maria suite ok	2011-07-15 09:09:33 +02:00
mysqlbinlog_row_engine.inc
mysqld--help.inc	merge with 5.3	2011-10-19 21:45:18 +02:00
mysqldump.inc
mysqlhotcopy.inc	5.5-merge	2011-07-02 22:08:51 +02:00
mysqltest-x.inc
ndb_backup.inc
ndb_backup_print.inc
ndb_default_cluster.inc
ndb_master-slave.inc
ndb_master-slave_2ch.inc
ndb_not_readonly.inc
ndb_restore_master.inc
ndb_restore_slave_eoption.inc
ndb_setup_slave.inc
ndb_wait_connected.inc
no_running_event_scheduler.inc
no_running_events.inc
no_valgrind_without_big.inc
not_as_root.inc
not_binlog_format_row.inc
not_blackhole.inc
not_crashrep.inc	Bug #11762804 55442: MYSQLD DEBUG CRASHES WHILE RUNNING MYISAM_CRASH_BEFORE_FLUSH_KEYS.TEST	2011-03-15 16:06:59 +01:00
not_debug.inc	Disable variables-big with debug binaries.	2011-02-27 01:25:56 +01:00
not_embedded.inc
not_ndb.inc
not_ndb_default.inc
not_openssl.inc
not_parallel.inc
not_staging.inc
not_threadpool.inc	Updates tests to handle thread pool correctly	2011-01-14 09:28:23 +01:00
not_valgrind.inc
not_var_link.inc
not_windows.inc
not_windows_embedded.inc
one_thread_per_connection.inc
parser_bug21114.inc
partition_date_range.inc
plugin.defs	Bug #12604711 MTR SHOULD READ PLUGIN.DEFS FILES FROM IMPORTED FEATURE TREES	2011-05-30 15:55:44 +02:00
ps_conv.inc	Merge with 5.1-microseconds	2011-05-28 05:11:32 +03:00
ps_create.inc
ps_ddl_1.inc
ps_modify.inc
ps_modify1.inc
ps_query.inc	Removed settings of 'derived_merge' to 'on' in ps tests.	2011-07-22 23:47:28 -07:00
ps_renew.inc
query_cache.inc
query_cache_sql_prepare.inc
read_many_rows.inc
report-features.test
restart_mysqld.inc
restart_slave_sql.inc	Merge with MySQL 5.1.57/58	2011-05-02 20:58:45 +03:00
rowid_order.inc
rpl_change_topology.inc
rpl_connect.inc
rpl_connection.inc
rpl_connection_master.inc	Merge with MySQL 5.1.57/58	2011-05-02 20:58:45 +03:00
rpl_connection_slave.inc	Merge with MySQL 5.1.57/58	2011-05-02 20:58:45 +03:00
rpl_connection_slave1.inc	Merge with MySQL 5.1.57/58	2011-05-02 20:58:45 +03:00
rpl_diff.inc
rpl_end.inc
rpl_events.inc
rpl_for_each_slave.inc
rpl_generate_sync_chain.inc
rpl_init.inc
rpl_ip_mix.inc
rpl_ip_mix2.inc
rpl_ipv6.inc
rpl_loaddata_charset.inc
rpl_multi_engine.inc
rpl_multi_engine2.inc
rpl_multi_engine3.inc
rpl_reconnect.inc
rpl_reset.inc
rpl_restart_server.inc
rpl_start_server.inc	Bug #59063 rpl_migration_crash_safe fails on Windows	2011-01-18 12:25:07 +01:00
rpl_start_slaves.inc
rpl_stmt_seq.inc
rpl_stop_server.inc	Bug #59063 rpl_migration_crash_safe fails on Windows	2011-01-18 12:25:07 +01:00
rpl_stop_slaves.inc
rpl_sync.inc	BUG#59147: rpl_circular_for_4_hosts fails sporadically	2011-02-03 16:09:33 +00:00
rpl_udf.inc
running_event_scheduler.inc
safe_set_to_maybe_ro_var.inc
save_master_pos.inc
select_ndb_apply_status.inc
set_binlog_format_mixed.sql
set_binlog_format_row.sql
set_binlog_format_statement.sql
setup_fake_relay_log.inc	BUG#59444: rpl_row_show_relaylog_events fails on daily-5.5 test runs	2011-01-12 18:35:06 +00:00
show_binary_logs.inc
show_binlog_events.inc	merge with 5.3	2011-10-19 21:45:18 +02:00
show_binlog_events2.inc	Backport MySQL WL#2540 into MariaDB.	2011-05-03 14:01:11 +02:00
show_binlog_using_logname.inc
show_events.inc
show_master_logs.inc
show_master_status.inc
show_msg.inc
show_msg80.inc
show_relaylog_events.inc
show_rpl_debug_info.inc
show_slave_status.inc
sp-vars.inc
start_slave.inc
stop_slave.inc
stop_slave_io.inc
stop_slave_sql.inc
strict_autoinc.inc
subselect_mat_cost.inc
sync_io_with_master.inc
sync_slave_io_with_master.inc
sync_slave_sql_with_io.inc
system_db_struct.inc
test_fieldsize.inc
test_outfile.inc
testdb_only.inc
tpcb.inc
tpcb_disk_data.inc
truncate_file.inc
type_hrtime.inc	merge with 5.1-micro	2011-06-07 18:13:02 +02:00
unsafe_binlog.inc
uses_vardir.inc
varchar.inc	merge with 5.3	2011-10-19 21:45:18 +02:00
view_alias.inc
wait_condition.inc	fixing pbxt and oqgraph suites	2011-07-14 18:25:05 +02:00
wait_condition_sp.inc
wait_for_binlog_event.inc
wait_for_ndb_to_binlog.inc
wait_for_query_to_fail.inc
wait_for_query_to_succeed.inc
wait_for_slave_io_error.inc
wait_for_slave_io_to_start.inc
wait_for_slave_io_to_stop.inc
wait_for_slave_param.inc
wait_for_slave_sql_error.inc
wait_for_slave_sql_error_and_skip.inc
wait_for_slave_sql_to_start.inc
wait_for_slave_sql_to_stop.inc
wait_for_slave_to_start.inc
wait_for_slave_to_stop.inc
wait_for_status_var.inc	5.5-merge	2011-07-02 22:08:51 +02:00
wait_show_condition.inc	BUG#12416700: RPL_SHOW_SLAVE_HOSTS FAILS SPORADICALLY (TIMEOUT	2011-05-10 12:41:09 +01:00
wait_until_connected_again.inc
wait_until_count_sessions.inc
wait_until_disconnected.inc
wait_until_rows_count.inc
windows.inc
windows_sys_vars.inc
world.inc
world_schema.inc
world_schema1.inc
write_var_to_file.inc