mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
167fb5f170
mysql-test/t/alias.test: Added end marker for test to make future merges easier mysql-test/t/alter_table.test: Added end marker for test to make future merges easier mysql-test/t/analyse.test: Added end marker for test to make future merges easier mysql-test/t/analyze.test: Added end marker for test to make future merges easier Fixed length of comment lines mysql-test/t/ansi.test: Added end marker for test to make future merges easier mysql-test/t/archive.test: Added end marker for test to make future merges easier mysql-test/t/auto_increment.test: Added end marker for test to make future merges easier mysql-test/t/backup.test: Added end marker for test to make future merges easier mysql-test/t/bdb-alter-table-1.test: Added end marker for test to make future merges easier mysql-test/t/bdb-alter-table-2.test: Added end marker for test to make future merges easier mysql-test/t/bdb-crash.test: Added end marker for test to make future merges easier mysql-test/t/bdb-deadlock.test: Added end marker for test to make future merges easier mysql-test/t/bdb-deadlock.tminus: Added end marker for test to make future merges easier mysql-test/t/bdb.test: Added end marker for test to make future merges easier mysql-test/t/bdb_cache.test: Added end marker for test to make future merges easier mysql-test/t/bench_count_distinct.test: Added end marker for test to make future merges easier mysql-test/t/bigint.test: Added end marker for test to make future merges easier mysql-test/t/binary.test: Added end marker for test to make future merges easier mysql-test/t/blackhole.test: Added end marker for test to make future merges easier mysql-test/t/bool.test: Added end marker for test to make future merges easier mysql-test/t/bulk_replace.test: Added end marker for test to make future merges easier mysql-test/t/case.test: Added end marker for test to make future merges easier mysql-test/t/cast.test: Added end marker for test to make future merges easier mysql-test/t/check.test: Added end marker for test to make future merges easier mysql-test/t/comments.test: Added end marker for test to make future merges easier mysql-test/t/compare.test: Added end marker for test to make future merges easier mysql-test/t/connect.test: Added end marker for test to make future merges easier mysql-test/t/consistent_snapshot.test: Added end marker for test to make future merges easier mysql-test/t/constraints.test: Added end marker for test to make future merges easier mysql-test/t/count_distinct.test: Added end marker for test to make future merges easier mysql-test/t/count_distinct2.test: Added end marker for test to make future merges easier mysql-test/t/count_distinct3.test: Added end marker for test to make future merges easier mysql-test/t/create.test: Added end marker for test to make future merges easier mysql-test/t/create_select_tmp.test: Added end marker for test to make future merges easier mysql-test/t/csv.test: Added end marker for test to make future merges easier mysql-test/t/ctype_big5.test: Added end marker for test to make future merges easier mysql-test/t/ctype_collate.test: Added end marker for test to make future merges easier mysql-test/t/ctype_cp1250_ch.test: Added end marker for test to make future merges easier mysql-test/t/ctype_cp1251.test: Added end marker for test to make future merges easier mysql-test/t/ctype_cp932.test: Added end marker for test to make future merges easier mysql-test/t/ctype_create.test: Added end marker for test to make future merges easier mysql-test/t/ctype_gbk.test: Added end marker for test to make future merges easier mysql-test/t/ctype_latin1.test: Added end marker for test to make future merges easier mysql-test/t/ctype_latin1_de.test: Added end marker for test to make future merges easier mysql-test/t/ctype_latin2.test: Added end marker for test to make future merges easier mysql-test/t/ctype_many.test: Added end marker for test to make future merges easier mysql-test/t/ctype_mb.test: Added end marker for test to make future merges easier mysql-test/t/ctype_recoding.test: Added end marker for test to make future merges easier mysql-test/t/ctype_sjis.test: Added end marker for test to make future merges easier mysql-test/t/ctype_tis620.test: Added end marker for test to make future merges easier mysql-test/t/ctype_uca.test: Added end marker for test to make future merges easier mysql-test/t/ctype_ucs.test: Added end marker for test to make future merges easier mysql-test/t/ctype_ucs_binlog.test: Added end marker for test to make future merges easier mysql-test/t/ctype_ujis.test: Added end marker for test to make future merges easier mysql-test/t/ctype_utf8.test: Added end marker for test to make future merges easier mysql-test/t/date_formats.test: Added end marker for test to make future merges easier mysql-test/t/delayed.test: Added end marker for test to make future merges easier mysql-test/t/delete.test: Added end marker for test to make future merges easier mysql-test/t/derived.test: Added end marker for test to make future merges easier mysql-test/t/dirty_close.test: Added end marker for test to make future merges easier mysql-test/t/distinct.test: Added end marker for test to make future merges easier mysql-test/t/drop.test: Added end marker for test to make future merges easier mysql-test/t/drop_temp_table.test: Added end marker for test to make future merges easier mysql-test/t/empty_table.test: Added end marker for test to make future merges easier mysql-test/t/endspace.test: Added end marker for test to make future merges easier mysql-test/t/errors.test: Added end marker for test to make future merges easier mysql-test/t/exampledb.test: Added end marker for test to make future merges easier mysql-test/t/explain.test: Added end marker for test to make future merges easier mysql-test/t/flush.test: Added end marker for test to make future merges easier mysql-test/t/flush_block_commit.test: Added end marker for test to make future merges easier mysql-test/t/flush_table.test: Added end marker for test to make future merges easier mysql-test/t/foreign_key.test: Added end marker for test to make future merges easier mysql-test/t/fulltext.test: Added end marker for test to make future merges easier mysql-test/t/fulltext2.test: Added end marker for test to make future merges easier mysql-test/t/fulltext_cache.test: Added end marker for test to make future merges easier mysql-test/t/fulltext_distinct.test: Added end marker for test to make future merges easier mysql-test/t/fulltext_left_join.test: Added end marker for test to make future merges easier mysql-test/t/fulltext_multi.test: Added end marker for test to make future merges easier mysql-test/t/fulltext_order_by.test: Added end marker for test to make future merges easier mysql-test/t/fulltext_update.test: Added end marker for test to make future merges easier mysql-test/t/fulltext_var.test: Added end marker for test to make future merges easier mysql-test/t/func_compress.test: Added end marker for test to make future merges easier mysql-test/t/func_concat.test: Added end marker for test to make future merges easier mysql-test/t/func_crypt.test: Added end marker for test to make future merges easier mysql-test/t/func_date_add.test: Added end marker for test to make future merges easier mysql-test/t/func_default.test: Added end marker for test to make future merges easier mysql-test/t/func_des_encrypt.test: Added end marker for test to make future merges easier mysql-test/t/func_encrypt.test: Added end marker for test to make future merges easier mysql-test/t/func_encrypt_nossl.test: Added end marker for test to make future merges easier mysql-test/t/func_equal.test: Added end marker for test to make future merges easier mysql-test/t/func_gconcat.test: Added end marker for test to make future merges easier mysql-test/t/func_group.test: Added end marker for test to make future merges easier mysql-test/t/func_if.test: Added end marker for test to make future merges easier mysql-test/t/func_in.test: Added end marker for test to make future merges easier mysql-test/t/func_isnull.test: Added end marker for test to make future merges easier mysql-test/t/func_like.test: Added end marker for test to make future merges easier mysql-test/t/func_math.test: Added end marker for test to make future merges easier mysql-test/t/func_misc.test: Added end marker for test to make future merges easier mysql-test/t/func_op.test: Added end marker for test to make future merges easier mysql-test/t/func_regexp.test: Added end marker for test to make future merges easier mysql-test/t/func_sapdb.test: Added end marker for test to make future merges easier mysql-test/t/func_set.test: Added end marker for test to make future merges easier mysql-test/t/func_str.test: Added end marker for test to make future merges easier mysql-test/t/func_system.test: Added end marker for test to make future merges easier mysql-test/t/func_test.test: Added end marker for test to make future merges easier mysql-test/t/func_time.test: Added end marker for test to make future merges easier mysql-test/t/func_timestamp.test: Added end marker for test to make future merges easier mysql-test/t/gcc296.test: Added end marker for test to make future merges easier mysql-test/t/gis-rtree.test: Added end marker for test to make future merges easier mysql-test/t/gis.test: Added end marker for test to make future merges easier mysql-test/t/grant.test: Added end marker for test to make future merges easier mysql-test/t/grant2.test: Added end marker for test to make future merges easier mysql-test/t/grant_cache.test: Added end marker for test to make future merges easier mysql-test/t/group_by.test: Added end marker for test to make future merges easier mysql-test/t/handler.test: Added end marker for test to make future merges easier mysql-test/t/having.test: Added end marker for test to make future merges easier mysql-test/t/heap.test: Added end marker for test to make future merges easier mysql-test/t/heap_auto_increment.test: Added end marker for test to make future merges easier mysql-test/t/heap_btree.test: Added end marker for test to make future merges easier mysql-test/t/heap_hash.test: Added end marker for test to make future merges easier mysql-test/t/help.test: Added end marker for test to make future merges easier mysql-test/t/init_connect.test: Added end marker for test to make future merges easier mysql-test/t/init_file.test: Added end marker for test to make future merges easier mysql-test/t/innodb-deadlock.test: Added end marker for test to make future merges easier mysql-test/t/innodb-lock.test: Added end marker for test to make future merges easier mysql-test/t/innodb-replace.test: Added end marker for test to make future merges easier mysql-test/t/innodb.test: Added end marker for test to make future merges easier mysql-test/t/innodb_cache.test: Added end marker for test to make future merges easier mysql-test/t/innodb_handler.test: Added end marker for test to make future merges easier mysql-test/t/insert.test: Added end marker for test to make future merges easier mysql-test/t/insert_select-binlog.test: Added end marker for test to make future merges easier mysql-test/t/insert_select.test: Added end marker for test to make future merges easier mysql-test/t/insert_update.test: Added end marker for test to make future merges easier mysql-test/t/isam.test: Added end marker for test to make future merges easier mysql-test/t/join.test: Added end marker for test to make future merges easier mysql-test/t/join_crash.test: Added end marker for test to make future merges easier mysql-test/t/join_outer.test: Added end marker for test to make future merges easier mysql-test/t/key.test: Added end marker for test to make future merges easier mysql-test/t/key_cache.test: Added end marker for test to make future merges easier mysql-test/t/key_diff.test: Added end marker for test to make future merges easier mysql-test/t/key_primary.test: Added end marker for test to make future merges easier mysql-test/t/keywords.test: Added end marker for test to make future merges easier mysql-test/t/kill.test: Added end marker for test to make future merges easier mysql-test/t/limit.test: Added end marker for test to make future merges easier mysql-test/t/loaddata.test: Added end marker for test to make future merges easier mysql-test/t/lock.test: Added end marker for test to make future merges easier mysql-test/t/lock_multi.test: Added end marker for test to make future merges easier mysql-test/t/lock_tables_lost_commit.test: Added end marker for test to make future merges easier mysql-test/t/lowercase_table.test: Added end marker for test to make future merges easier mysql-test/t/lowercase_table2.test: Added end marker for test to make future merges easier mysql-test/t/lowercase_table3.test: Added end marker for test to make future merges easier mysql-test/t/lowercase_table_grant.test: Added end marker for test to make future merges easier mysql-test/t/lowercase_table_qcache.test: Added end marker for test to make future merges easier mysql-test/t/merge.test: Added end marker for test to make future merges easier mysql-test/t/metadata.test: Added end marker for test to make future merges easier mysql-test/t/mix_innodb_myisam_binlog.test: Added end marker for test to make future merges easier mysql-test/t/multi_statement.test: Added end marker for test to make future merges easier mysql-test/t/multi_update.test: Added end marker for test to make future merges easier mysql-test/t/myisam-blob.test: Added end marker for test to make future merges easier mysql-test/t/myisam.test: Added end marker for test to make future merges easier mysql-test/t/mysql_client_test.test: Added end marker for test to make future merges easier mysql-test/t/mysql_protocols.test: Added end marker for test to make future merges easier mysql-test/t/mysqlbinlog.test: Added end marker for test to make future merges easier mysql-test/t/mysqlbinlog2.test: Added end marker for test to make future merges easier mysql-test/t/mysqldump.test: Added end marker for test to make future merges easier mysql-test/t/mysqltest.test: Added end marker for test to make future merges easier mysql-test/t/ndb_alter_table.test: Added end marker for test to make future merges easier mysql-test/t/ndb_autodiscover.test: Added end marker for test to make future merges easier mysql-test/t/ndb_autodiscover2.test: Added end marker for test to make future merges easier mysql-test/t/ndb_basic.test: Added end marker for test to make future merges easier mysql-test/t/ndb_blob.test: Added end marker for test to make future merges easier mysql-test/t/ndb_cache.test: Added end marker for test to make future merges easier mysql-test/t/ndb_charset.test: Added end marker for test to make future merges easier mysql-test/t/ndb_config.test: Added end marker for test to make future merges easier mysql-test/t/ndb_database.test: Added end marker for test to make future merges easier mysql-test/t/ndb_grant.later: Added end marker for test to make future merges easier mysql-test/t/ndb_index.test: Added end marker for test to make future merges easier mysql-test/t/ndb_index_ordered.test: Added end marker for test to make future merges easier mysql-test/t/ndb_index_unique.test: Added end marker for test to make future merges easier mysql-test/t/ndb_insert.test: Added end marker for test to make future merges easier mysql-test/t/ndb_limit.test: Added end marker for test to make future merges easier mysql-test/t/ndb_lock.test: Added end marker for test to make future merges easier mysql-test/t/ndb_minmax.test: Added end marker for test to make future merges easier mysql-test/t/ndb_multi.test: Added end marker for test to make future merges easier mysql-test/t/ndb_replace.test: Added end marker for test to make future merges easier mysql-test/t/ndb_restore.test: Added end marker for test to make future merges easier mysql-test/t/ndb_subquery.test: Added end marker for test to make future merges easier mysql-test/t/ndb_transaction.test: Added end marker for test to make future merges easier mysql-test/t/ndb_truncate.test: Added end marker for test to make future merges easier mysql-test/t/ndb_types.test: Added end marker for test to make future merges easier mysql-test/t/ndb_update.test: Added end marker for test to make future merges easier mysql-test/t/negation_elimination.test: Added end marker for test to make future merges easier mysql-test/t/not_embedded_server.test: Added end marker for test to make future merges easier mysql-test/t/null.test: Added end marker for test to make future merges easier mysql-test/t/null_key.test: Added end marker for test to make future merges easier mysql-test/t/odbc.test: Added end marker for test to make future merges easier mysql-test/t/olap.test: Added end marker for test to make future merges easier mysql-test/t/openssl_1.test: Added end marker for test to make future merges easier mysql-test/t/order_by.test: Added end marker for test to make future merges easier mysql-test/t/order_fill_sortbuf.test: Added end marker for test to make future merges easier mysql-test/t/outfile.test: Added end marker for test to make future merges easier mysql-test/t/overflow.test: Added end marker for test to make future merges easier mysql-test/t/packet.test: Added end marker for test to make future merges easier mysql-test/t/preload.test: Added end marker for test to make future merges easier mysql-test/t/ps.test: Added end marker for test to make future merges easier mysql-test/t/ps_10nestset.test: Added end marker for test to make future merges easier mysql-test/t/ps_11bugs.test: Added end marker for test to make future merges easier mysql-test/t/ps_1general.test: Added end marker for test to make future merges easier mysql-test/t/ps_2myisam.test: Added end marker for test to make future merges easier mysql-test/t/ps_3innodb.test: Added end marker for test to make future merges easier mysql-test/t/ps_4heap.test: Added end marker for test to make future merges easier mysql-test/t/ps_5merge.test: Added end marker for test to make future merges easier mysql-test/t/ps_6bdb.test: Added end marker for test to make future merges easier mysql-test/t/ps_7ndb.test: Added end marker for test to make future merges easier mysql-test/t/ps_grant.test: Added end marker for test to make future merges easier mysql-test/t/query_cache.test: Added end marker for test to make future merges easier mysql-test/t/query_cache_merge.test: Added end marker for test to make future merges easier mysql-test/t/raid.test: Added end marker for test to make future merges easier mysql-test/t/range.test: Added end marker for test to make future merges easier mysql-test/t/rename.test: Added end marker for test to make future merges easier mysql-test/t/repair.test: Added end marker for test to make future merges easier mysql-test/t/replace.test: Added end marker for test to make future merges easier mysql-test/t/rollback.test: Added end marker for test to make future merges easier mysql-test/t/row.test: Added end marker for test to make future merges easier mysql-test/t/rpl000001.test: Added end marker for test to make future merges easier mysql-test/t/rpl000002.test: Added end marker for test to make future merges easier mysql-test/t/rpl000004.test: Added end marker for test to make future merges easier mysql-test/t/rpl000005.test: Added end marker for test to make future merges easier mysql-test/t/rpl000006.test: Added end marker for test to make future merges easier mysql-test/t/rpl000008.test: Added end marker for test to make future merges easier mysql-test/t/rpl000009.test: Added end marker for test to make future merges easier mysql-test/t/rpl000010.test: Added end marker for test to make future merges easier mysql-test/t/rpl000011.test: Added end marker for test to make future merges easier mysql-test/t/rpl000012.test: Added end marker for test to make future merges easier mysql-test/t/rpl000013.test: Added end marker for test to make future merges easier mysql-test/t/rpl000015.test: Added end marker for test to make future merges easier mysql-test/t/rpl000017.test: Added end marker for test to make future merges easier mysql-test/t/rpl000018.test: Added end marker for test to make future merges easier mysql-test/t/rpl_EE_error.test: Added end marker for test to make future merges easier mysql-test/t/rpl_alter.test: Added end marker for test to make future merges easier mysql-test/t/rpl_chain_temp_table.test: Added end marker for test to make future merges easier mysql-test/t/rpl_change_master.test: Added end marker for test to make future merges easier mysql-test/t/rpl_charset.test: Added end marker for test to make future merges easier mysql-test/t/rpl_commit_after_flush.test: Added end marker for test to make future merges easier mysql-test/t/rpl_create_database.test: Added end marker for test to make future merges easier mysql-test/t/rpl_ddl.test: Added end marker for test to make future merges easier mysql-test/t/rpl_deadlock.test: Added end marker for test to make future merges easier mysql-test/t/rpl_delete_all.test: Added end marker for test to make future merges easier mysql-test/t/rpl_do_grant.test: Added end marker for test to make future merges easier mysql-test/t/rpl_drop.test: Added end marker for test to make future merges easier mysql-test/t/rpl_drop_temp.test: Added end marker for test to make future merges easier mysql-test/t/rpl_empty_master_crash.test: Added end marker for test to make future merges easier mysql-test/t/rpl_error_ignored_table.test: Added end marker for test to make future merges easier mysql-test/t/rpl_failed_optimize.test: Added end marker for test to make future merges easier mysql-test/t/rpl_failsafe.test: Added end marker for test to make future merges easier mysql-test/t/rpl_flush_log_loop.test: Added end marker for test to make future merges easier mysql-test/t/rpl_flush_tables.test: Added end marker for test to make future merges easier mysql-test/t/rpl_free_items.test: Added end marker for test to make future merges easier mysql-test/t/rpl_get_lock.test: Added end marker for test to make future merges easier mysql-test/t/rpl_heap.test: Added end marker for test to make future merges easier mysql-test/t/rpl_ignore_grant.test: Added end marker for test to make future merges easier mysql-test/t/rpl_init_slave.test: Added end marker for test to make future merges easier mysql-test/t/rpl_innodb.test: Added end marker for test to make future merges easier mysql-test/t/rpl_insert_id.test: Added end marker for test to make future merges easier mysql-test/t/rpl_insert_ignore.test: Added end marker for test to make future merges easier mysql-test/t/rpl_loaddata.test: Added end marker for test to make future merges easier mysql-test/t/rpl_loaddata_rule_m.test: Added end marker for test to make future merges easier mysql-test/t/rpl_loaddata_rule_s.test: Added end marker for test to make future merges easier mysql-test/t/rpl_loaddatalocal.test: Added end marker for test to make future merges easier mysql-test/t/rpl_log.test: Added end marker for test to make future merges easier mysql-test/t/rpl_log_pos.test: Added end marker for test to make future merges easier mysql-test/t/rpl_many_optimize.test: Added end marker for test to make future merges easier mysql-test/t/rpl_master_pos_wait.test: Added end marker for test to make future merges easier mysql-test/t/rpl_max_relay_size.test: Added end marker for test to make future merges easier mysql-test/t/rpl_misc_functions.test: Added end marker for test to make future merges easier mysql-test/t/rpl_multi_delete.test: Added end marker for test to make future merges easier mysql-test/t/rpl_multi_delete2.test: Added end marker for test to make future merges easier mysql-test/t/rpl_multi_query.test: Added end marker for test to make future merges easier mysql-test/t/rpl_multi_update.test: Added end marker for test to make future merges easier mysql-test/t/rpl_multi_update2.test: Added end marker for test to make future merges easier mysql-test/t/rpl_multi_update3.test: Added end marker for test to make future merges easier mysql-test/t/rpl_mystery22.test: Added end marker for test to make future merges easier mysql-test/t/rpl_openssl.test: Added end marker for test to make future merges easier mysql-test/t/rpl_optimize.test: Added end marker for test to make future merges easier mysql-test/t/rpl_ps.test: Added end marker for test to make future merges easier mysql-test/t/rpl_redirect.test: Added end marker for test to make future merges easier mysql-test/t/rpl_relayrotate.test: Added end marker for test to make future merges easier mysql-test/t/rpl_relayspace.test: Added end marker for test to make future merges easier mysql-test/t/rpl_replicate_do.test: Added end marker for test to make future merges easier mysql-test/t/rpl_reset_slave.test: Added end marker for test to make future merges easier mysql-test/t/rpl_rewrite_db.test: Added end marker for test to make future merges easier mysql-test/t/rpl_rotate_logs.test: Added end marker for test to make future merges easier mysql-test/t/rpl_server_id1.test: Added end marker for test to make future merges easier mysql-test/t/rpl_server_id2.test: Added end marker for test to make future merges easier mysql-test/t/rpl_set_charset.test: Added end marker for test to make future merges easier mysql-test/t/rpl_skip_error.test: Added end marker for test to make future merges easier mysql-test/t/rpl_sporadic_master.test: Added end marker for test to make future merges easier mysql-test/t/rpl_start_stop_slave.test: Added end marker for test to make future merges easier mysql-test/t/rpl_temporary.test: Added end marker for test to make future merges easier mysql-test/t/rpl_timezone.test: Added end marker for test to make future merges easier mysql-test/t/rpl_trunc_binlog.test: Added end marker for test to make future merges easier mysql-test/t/rpl_until.test: Added end marker for test to make future merges easier mysql-test/t/rpl_user_variables.test: Added end marker for test to make future merges easier mysql-test/t/rpl_variables.test: Added end marker for test to make future merges easier mysql-test/t/select.test: Added end marker for test to make future merges easier mysql-test/t/select_found.test: Added end marker for test to make future merges easier mysql-test/t/select_safe.test: Added end marker for test to make future merges easier mysql-test/t/show_check.test: Added end marker for test to make future merges easier mysql-test/t/skip_name_resolve.test: Added end marker for test to make future merges easier mysql-test/t/sql_mode.test: Added end marker for test to make future merges easier mysql-test/t/status.test: Added end marker for test to make future merges easier mysql-test/t/subselect.test: Added end marker for test to make future merges easier mysql-test/t/subselect2.test: Added end marker for test to make future merges easier mysql-test/t/subselect_gis.test: Added end marker for test to make future merges easier mysql-test/t/subselect_innodb.test: Added end marker for test to make future merges easier mysql-test/t/symlink.test: Added end marker for test to make future merges easier mysql-test/t/synchronization.test: Added end marker for test to make future merges easier mysql-test/t/system_mysql_db.test: Added end marker for test to make future merges easier mysql-test/t/system_mysql_db_fix.test: Added end marker for test to make future merges easier mysql-test/t/system_mysql_db_refs.test: Added end marker for test to make future merges easier mysql-test/t/tablelock.test: Added end marker for test to make future merges easier mysql-test/t/temp_table.test: Added end marker for test to make future merges easier mysql-test/t/timezone.test: Added end marker for test to make future merges easier mysql-test/t/timezone2.test: Added end marker for test to make future merges easier mysql-test/t/timezone3.test: Added end marker for test to make future merges easier mysql-test/t/timezone_grant.test: Added end marker for test to make future merges easier mysql-test/t/truncate.test: Added end marker for test to make future merges easier mysql-test/t/type_blob.test: Added end marker for test to make future merges easier mysql-test/t/type_date.test: Added end marker for test to make future merges easier mysql-test/t/type_datetime.test: Added end marker for test to make future merges easier mysql-test/t/type_decimal.test: Added end marker for test to make future merges easier mysql-test/t/type_enum.test: Added end marker for test to make future merges easier mysql-test/t/type_float.test: Added end marker for test to make future merges easier mysql-test/t/type_nchar.test: Added end marker for test to make future merges easier mysql-test/t/type_ranges.test: Added end marker for test to make future merges easier mysql-test/t/type_set.test: Added end marker for test to make future merges easier mysql-test/t/type_time.test: Added end marker for test to make future merges easier mysql-test/t/type_timestamp.test: Added end marker for test to make future merges easier mysql-test/t/type_uint.test: Added end marker for test to make future merges easier mysql-test/t/type_year.test: Added end marker for test to make future merges easier mysql-test/t/union.test: Added end marker for test to make future merges easier mysql-test/t/update.test: Added end marker for test to make future merges easier mysql-test/t/user_var-binlog.test: Added end marker for test to make future merges easier mysql-test/t/user_var.test: Added end marker for test to make future merges easier mysql-test/t/varbinary.test: Added end marker for test to make future merges easier mysql-test/t/variables.test: Added end marker for test to make future merges easier mysql-test/t/warnings.test: Added end marker for test to make future merges easier
451 lines
14 KiB
Text
451 lines
14 KiB
Text
#
|
|
# Test of update statement that uses many tables.
|
|
#
|
|
|
|
--disable_warnings
|
|
drop table if exists t1,t2,t3;
|
|
drop database if exists mysqltest;
|
|
--error 0,1141,1147
|
|
revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
|
|
--error 0,1141,1147
|
|
revoke all privileges on mysqltest.* from mysqltest_1@localhost;
|
|
delete from mysql.user where user=_binary'mysqltest_1';
|
|
--enable_warnings
|
|
|
|
create table t1(id1 int not null auto_increment primary key, t char(12));
|
|
create table t2(id2 int not null, t char(12));
|
|
create table t3(id3 int not null, t char(12), index(id3));
|
|
disable_query_log;
|
|
let $1 = 100;
|
|
while ($1)
|
|
{
|
|
let $2 = 5;
|
|
eval insert into t1(t) values ('$1');
|
|
while ($2)
|
|
{
|
|
eval insert into t2(id2,t) values ($1,'$2');
|
|
let $3 = 10;
|
|
while ($3)
|
|
{
|
|
eval insert into t3(id3,t) values ($1,'$2');
|
|
dec $3;
|
|
}
|
|
dec $2;
|
|
}
|
|
dec $1;
|
|
}
|
|
enable_query_log;
|
|
|
|
select count(*) from t1 where id1 > 95;
|
|
select count(*) from t2 where id2 > 95;
|
|
select count(*) from t3 where id3 > 95;
|
|
|
|
update t1,t2,t3 set t1.t="aaa", t2.t="bbb", t3.t="cc" where t1.id1 = t2.id2 and t2.id2 = t3.id3 and t1.id1 > 90;
|
|
select count(*) from t1 where t = "aaa";
|
|
select count(*) from t1 where id1 > 90;
|
|
select count(*) from t2 where t = "bbb";
|
|
select count(*) from t2 where id2 > 90;
|
|
select count(*) from t3 where t = "cc";
|
|
select count(*) from t3 where id3 > 90;
|
|
delete t1.*, t2.*, t3.* from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3 and t1.id1 > 95;
|
|
|
|
check table t1, t2, t3;
|
|
|
|
select count(*) from t1 where id1 > 95;
|
|
select count(*) from t2 where id2 > 95;
|
|
select count(*) from t3 where id3 > 95;
|
|
|
|
delete t1, t2, t3 from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3 and t1.id1 > 5;
|
|
select count(*) from t1 where id1 > 5;
|
|
select count(*) from t2 where id2 > 5;
|
|
select count(*) from t3 where id3 > 5;
|
|
|
|
delete from t1, t2, t3 using t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3 and t1.id1 > 0;
|
|
|
|
# These queries will force a scan of the table
|
|
select count(*) from t1 where id1;
|
|
select count(*) from t2 where id2;
|
|
select count(*) from t3 where id3;
|
|
drop table t1,t2,t3;
|
|
|
|
create table t1(id1 int not null primary key, t varchar(100)) pack_keys = 1;
|
|
create table t2(id2 int not null, t varchar(100), index(id2)) pack_keys = 1;
|
|
disable_query_log;
|
|
let $1 = 1000;
|
|
while ($1)
|
|
{
|
|
let $2 = 5;
|
|
eval insert into t1 values ($1,'aaaaaaaaaaaaaaaaaaaa');
|
|
while ($2)
|
|
{
|
|
eval insert into t2(id2,t) values ($1,'bbbbbbbbbbbbbbbbb');
|
|
dec $2;
|
|
}
|
|
dec $1;
|
|
}
|
|
enable_query_log;
|
|
delete t1 from t1,t2 where t1.id1 = t2.id2 and t1.id1 > 500;
|
|
drop table t1,t2;
|
|
|
|
CREATE TABLE t1 (
|
|
id int(11) NOT NULL default '0',
|
|
name varchar(10) default NULL,
|
|
PRIMARY KEY (id)
|
|
) ENGINE=MyISAM;
|
|
INSERT INTO t1 VALUES (1,'aaa'),(2,'aaa'),(3,'aaa');
|
|
CREATE TABLE t2 (
|
|
id int(11) NOT NULL default '0',
|
|
name varchar(10) default NULL,
|
|
PRIMARY KEY (id)
|
|
) ENGINE=MyISAM;
|
|
INSERT INTO t2 VALUES (2,'bbb'),(3,'bbb'),(4,'bbb');
|
|
CREATE TABLE t3 (
|
|
id int(11) NOT NULL default '0',
|
|
mydate datetime default NULL,
|
|
PRIMARY KEY (id)
|
|
) ENGINE=MyISAM;
|
|
INSERT INTO t3 VALUES (1,'2002-02-04 00:00:00'),(3,'2002-05-12 00:00:00'),(5,'2002-05-12 00:00:00'),(6,'2002-06-22
|
|
00:00:00'),(7,'2002-07-22 00:00:00');
|
|
delete t1,t2,t3 from t1,t2,t3 where to_days(now())-to_days(t3.mydate)>=30 and t3.id=t1.id and t3.id=t2.id;
|
|
select * from t3;
|
|
DROP TABLE t1,t2,t3;
|
|
|
|
CREATE TABLE IF NOT EXISTS `t1` (
|
|
`id` int(11) NOT NULL auto_increment,
|
|
`tst` text,
|
|
`tst1` text,
|
|
PRIMARY KEY (`id`)
|
|
) ENGINE=MyISAM;
|
|
|
|
CREATE TABLE IF NOT EXISTS `t2` (
|
|
`ID` int(11) NOT NULL auto_increment,
|
|
`ParId` int(11) default NULL,
|
|
`tst` text,
|
|
`tst1` text,
|
|
PRIMARY KEY (`ID`),
|
|
KEY `IX_ParId_t2` (`ParId`),
|
|
FOREIGN KEY (`ParId`) REFERENCES `t1` (`id`)
|
|
) ENGINE=MyISAM;
|
|
|
|
INSERT INTO t1(tst,tst1) VALUES("MySQL","MySQL AB"), ("MSSQL","Microsoft"), ("ORACLE","ORACLE");
|
|
|
|
INSERT INTO t2(ParId) VALUES(1), (2), (3);
|
|
|
|
select * from t2;
|
|
|
|
UPDATE t2, t1 SET t2.tst = t1.tst, t2.tst1 = t1.tst1 WHERE t2.ParId = t1.Id;
|
|
|
|
select * from t2;
|
|
drop table t1, t2 ;
|
|
|
|
create table t1 (n numeric(10));
|
|
create table t2 (n numeric(10));
|
|
insert into t2 values (1),(2),(4),(8),(16),(32);
|
|
select * from t2 left outer join t1 using (n);
|
|
delete t1,t2 from t2 left outer join t1 using (n);
|
|
select * from t2 left outer join t1 using (n);
|
|
drop table t1,t2 ;
|
|
|
|
#
|
|
# Test with locking
|
|
#
|
|
|
|
create table t1 (n int(10) not null primary key, d int(10));
|
|
create table t2 (n int(10) not null primary key, d int(10));
|
|
insert into t1 values(1,1);
|
|
insert into t2 values(1,10),(2,20);
|
|
LOCK TABLES t1 write, t2 read;
|
|
--error 1099
|
|
DELETE t1.*, t2.* FROM t1,t2 where t1.n=t2.n;
|
|
--error 1099
|
|
UPDATE t1,t2 SET t1.d=t2.d,t2.d=30 WHERE t1.n=t2.n;
|
|
UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
|
|
unlock tables;
|
|
LOCK TABLES t1 write, t2 write;
|
|
UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
|
|
select * from t1;
|
|
DELETE t1.*, t2.* FROM t1,t2 where t1.n=t2.n;
|
|
select * from t1;
|
|
select * from t2;
|
|
unlock tables;
|
|
drop table t1,t2;
|
|
|
|
#
|
|
# Test safe updates and timestamps
|
|
#
|
|
set sql_safe_updates=1;
|
|
create table t1 (n int(10), d int(10));
|
|
create table t2 (n int(10), d int(10));
|
|
insert into t1 values(1,1);
|
|
insert into t2 values(1,10),(2,20);
|
|
--error 1175
|
|
UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
|
|
set sql_safe_updates=0;
|
|
drop table t1,t2;
|
|
set timestamp=1038401397;
|
|
create table t1 (n int(10) not null primary key, d int(10), t timestamp);
|
|
create table t2 (n int(10) not null primary key, d int(10), t timestamp);
|
|
insert into t1 values(1,1,NULL);
|
|
insert into t2 values(1,10,NULL),(2,20,NULL);
|
|
set timestamp=1038000000;
|
|
UPDATE t1,t2 SET t1.d=t2.d WHERE t1.n=t2.n;
|
|
select n,d,unix_timestamp(t) from t1;
|
|
select n,d,unix_timestamp(t) from t2;
|
|
--error 1064
|
|
UPDATE t1,t2 SET 1=2 WHERE t1.n=t2.n;
|
|
drop table t1,t2;
|
|
set timestamp=0;
|
|
set sql_safe_updates=0;
|
|
create table t1 (n int(10) not null primary key, d int(10));
|
|
create table t2 (n int(10) not null primary key, d int(10));
|
|
insert into t1 values(1,1), (3,3);
|
|
insert into t2 values(1,10),(2,20);
|
|
UPDATE t2 left outer join t1 on t1.n=t2.n SET t1.d=t2.d;
|
|
select * from t1;
|
|
select * from t2;
|
|
drop table t1,t2;
|
|
create table t1 (n int(10), d int(10));
|
|
create table t2 (n int(10), d int(10));
|
|
insert into t1 values(1,1),(1,2);
|
|
insert into t2 values(1,10),(2,20);
|
|
UPDATE t1,t2 SET t1.d=t2.d,t2.d=30 WHERE t1.n=t2.n;
|
|
select * from t1;
|
|
select * from t2;
|
|
drop table t1,t2;
|
|
create table t1 (n int(10), d int(10));
|
|
create table t2 (n int(10), d int(10));
|
|
insert into t1 values(1,1),(3,2);
|
|
insert into t2 values(1,10),(1,20);
|
|
UPDATE t1,t2 SET t1.d=t2.d,t2.d=30 WHERE t1.n=t2.n;
|
|
select * from t1;
|
|
select * from t2;
|
|
UPDATE t1 a ,t2 b SET a.d=b.d,b.d=30 WHERE a.n=b.n;
|
|
select * from t1;
|
|
select * from t2;
|
|
DELETE a, b FROM t1 a,t2 b where a.n=b.n;
|
|
select * from t1;
|
|
select * from t2;
|
|
drop table t1,t2;
|
|
|
|
CREATE TABLE t1 ( broj int(4) unsigned NOT NULL default '0', naziv char(25) NOT NULL default 'NEPOZNAT', PRIMARY KEY (broj)) ENGINE=MyISAM;
|
|
INSERT INTO t1 VALUES (1,'jedan'),(2,'dva'),(3,'tri'),(4,'xxxxxxxxxx'),(5,'a'),(10,''),(11,''),(12,''),(13,'');
|
|
CREATE TABLE t2 ( broj int(4) unsigned NOT NULL default '0', naziv char(25) NOT NULL default 'NEPOZNAT', PRIMARY KEY (broj)) ENGINE=MyISAM;
|
|
INSERT INTO t2 VALUES (1,'jedan'),(2,'dva'),(3,'tri'),(4,'xxxxxxxxxx'),(5,'a');
|
|
CREATE TABLE t3 ( broj int(4) unsigned NOT NULL default '0', naziv char(25) NOT NULL default 'NEPOZNAT', PRIMARY KEY (broj)) ENGINE=MyISAM;
|
|
INSERT INTO t3 VALUES (1,'jedan'),(2,'dva');
|
|
update t1,t2 set t1.naziv="aaaa" where t1.broj=t2.broj;
|
|
update t1,t2,t3 set t1.naziv="bbbb", t2.naziv="aaaa" where t1.broj=t2.broj and t2.broj=t3.broj;
|
|
drop table t1,t2,t3;
|
|
|
|
#
|
|
# Test multi update with different join methods
|
|
#
|
|
|
|
CREATE TABLE t1 (a int not null primary key, b int not null, key (b));
|
|
CREATE TABLE t2 (a int not null primary key, b int not null, key (b));
|
|
INSERT INTO t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
|
|
INSERT INTO t2 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9);
|
|
|
|
# Full join, without key
|
|
update t1,t2 set t1.a=t1.a+100;
|
|
select * from t1;
|
|
|
|
# unique key
|
|
update t1,t2 set t1.a=t1.a+100 where t1.a=101;
|
|
select * from t1;
|
|
|
|
# ref key
|
|
update t1,t2 set t1.b=t1.b+10 where t1.b=2;
|
|
select * from t1;
|
|
|
|
# Range key (in t1)
|
|
update t1,t2 set t1.b=t1.b+2,t2.b=t1.b+10 where t1.b between 3 and 5 and t2.a=t1.a-100;
|
|
select * from t1;
|
|
select * from t2;
|
|
|
|
# test for non-updating table which is also used in sub-select
|
|
|
|
update t1,t2 set t1.b=t2.b, t1.a=t2.a where t1.a=t2.a and not exists (select * from t2 where t2.a > 10);
|
|
|
|
drop table t1,t2;
|
|
CREATE TABLE t3 ( KEY1 varchar(50) NOT NULL default '', PARAM_CORR_DISTANCE_RUSH double default NULL, PARAM_CORR_DISTANCE_GEM double default NULL, PARAM_AVG_TARE double default NULL, PARAM_AVG_NB_DAYS double default NULL, PARAM_DEFAULT_PROP_GEM_SRVC varchar(50) default NULL, PARAM_DEFAULT_PROP_GEM_NO_ETIK varchar(50) default NULL, PARAM_SCENARIO_COSTS varchar(50) default NULL, PARAM_DEFAULT_WAGON_COST double default NULL, tmp int(11) default NULL, PRIMARY KEY (KEY1)) ENGINE=MyISAM;
|
|
INSERT INTO t3 VALUES ('A',1,1,22,3.2,'R','R','BASE2',0.24,NULL);
|
|
create table t1 (A varchar(1));
|
|
insert into t1 values ("A") ,("B"),("C"),("D");
|
|
create table t2(Z varchar(15));
|
|
insert into t2(Z) select concat(a.a,b.a,c.a,d.a) from t1 as a, t1 as b, t1 as c, t1 as d;
|
|
update t2,t3 set Z =param_scenario_costs;
|
|
drop table t1,t2,t3;
|
|
create table t1 (a int, b int);
|
|
create table t2 (a int, b int);
|
|
insert into t1 values (1,1),(2,1),(3,1);
|
|
insert into t2 values (1,1), (3,1);
|
|
update t1 left join t2 on t1.a=t2.a set t1.b=2, t2.b=2 where t1.b=1 and t2.b=1 or t2.a is NULL;
|
|
select t1.a, t1.b,t2.a, t2.b from t1 left join t2 on t1.a=t2.a where t1.b=1 and t2.b=1 or t2.a is NULL;
|
|
drop table t1,t2;
|
|
|
|
#
|
|
# Test reuse of same table
|
|
#
|
|
|
|
create table t1 (a int not null auto_increment primary key, b int not null);
|
|
insert into t1 (b) values (1),(2),(3),(4);
|
|
update t1, t1 as t2 set t1.b=t2.b+1 where t1.a=t2.a;
|
|
select * from t1;
|
|
drop table t1;
|
|
|
|
# Test multi-update and multi-delete with impossible where
|
|
|
|
create table t1(id1 smallint(5), field char(5));
|
|
create table t2(id2 smallint(5), field char(5));
|
|
|
|
insert into t1 values (1, 'a'), (2, 'aa');
|
|
insert into t2 values (1, 'b'), (2, 'bb');
|
|
|
|
select * from t1;
|
|
select * from t2;
|
|
|
|
update t2 inner join t1 on t1.id1=t2.id2
|
|
set t2.field=t1.field
|
|
where 0=1;
|
|
update t2, t1 set t2.field=t1.field
|
|
where t1.id1=t2.id2 and 0=1;
|
|
|
|
delete t1, t2 from t2 inner join t1 on t1.id1=t2.id2
|
|
where 0=1;
|
|
delete t1, t2 from t2,t1
|
|
where t1.id1=t2.id2 and 0=1;
|
|
|
|
drop table t1,t2;
|
|
|
|
#
|
|
# Test for bug #1820.
|
|
#
|
|
|
|
create table t1 ( a int not null, b int not null) ;
|
|
--disable_query_log
|
|
insert into t1 values (1,1),(2,2),(3,3),(4,4);
|
|
let $1=19;
|
|
set @d=4;
|
|
while ($1)
|
|
{
|
|
eval insert into t1 select a+@d,b+@d from t1;
|
|
eval set @d=@d*2;
|
|
dec $1;
|
|
}
|
|
|
|
--enable_query_log
|
|
alter table t1 add index i1(a);
|
|
delete from t1 where a > 2000000;
|
|
create table t2 like t1;
|
|
insert into t2 select * from t1;
|
|
|
|
select 't2 rows before small delete', count(*) from t1;
|
|
delete t1,t2 from t1,t2 where t1.b=t2.a and t1.a < 2;
|
|
select 't2 rows after small delete', count(*) from t2;
|
|
select 't1 rows after small delete', count(*) from t1;
|
|
|
|
## Try deleting many rows
|
|
|
|
delete t1,t2 from t1,t2 where t1.b=t2.a and t1.a < 100*1000;
|
|
select 't2 rows after big delete', count(*) from t2;
|
|
select 't1 rows after big delete', count(*) from t1;
|
|
|
|
drop table t1,t2;
|
|
|
|
#
|
|
# Test alias (this is not correct in 4.0)
|
|
#
|
|
|
|
CREATE TABLE t1 ( a int );
|
|
CREATE TABLE t2 ( a int );
|
|
DELETE t1 FROM t1, t2 AS t3;
|
|
DELETE t4 FROM t1, t1 AS t4;
|
|
DELETE t3 FROM t1 AS t3, t1 AS t4;
|
|
--error 1109
|
|
DELETE t1 FROM t1 AS t3, t2 AS t4;
|
|
INSERT INTO t1 values (1),(2);
|
|
INSERT INTO t2 values (1),(2);
|
|
DELETE t1 FROM t1 AS t2, t2 AS t1 where t1.a=t2.a and t1.a=1;
|
|
SELECT * from t1;
|
|
SELECT * from t2;
|
|
DELETE t2 FROM t1 AS t2, t2 AS t1 where t1.a=t2.a and t1.a=2;
|
|
SELECT * from t1;
|
|
SELECT * from t2;
|
|
DROP TABLE t1,t2;
|
|
|
|
#
|
|
# Test update with const tables
|
|
#
|
|
create table `t1` (`p_id` int(10) unsigned NOT NULL auto_increment, `p_code` varchar(20) NOT NULL default '', `p_active` tinyint(1) unsigned NOT NULL default '1', PRIMARY KEY (`p_id`) );
|
|
create table `t2` (`c2_id` int(10) unsigned NULL auto_increment, `c2_p_id` int(10) unsigned NOT NULL default '0', `c2_note` text NOT NULL, `c2_active` tinyint(1) unsigned NOT NULL default '1', PRIMARY KEY (`c2_id`), KEY `c2_p_id` (`c2_p_id`) );
|
|
insert into t1 values (0,'A01-Comp',1);
|
|
insert into t1 values (0,'B01-Comp',1);
|
|
insert into t2 values (0,1,'A Note',1);
|
|
update t1 left join t2 on p_id = c2_p_id set c2_note = 'asdf-1' where p_id = 2;
|
|
select * from t1;
|
|
select * from t2;
|
|
drop table t1, t2;
|
|
|
|
#
|
|
# privilege check for multiupdate with other tables
|
|
#
|
|
|
|
connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
|
|
connection root;
|
|
--disable_warnings
|
|
create database mysqltest;
|
|
--enable_warnings
|
|
create table mysqltest.t1 (a int, b int, primary key (a));
|
|
create table mysqltest.t2 (a int, b int, primary key (a));
|
|
create table mysqltest.t3 (a int, b int, primary key (a));
|
|
grant select on mysqltest.* to mysqltest_1@localhost;
|
|
grant update on mysqltest.t1 to mysqltest_1@localhost;
|
|
connect (user1,localhost,mysqltest_1,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK);
|
|
connection user1;
|
|
update t1, t2 set t1.b=1 where t1.a=t2.a;
|
|
update t1, t2 set t1.b=(select t3.b from t3 where t1.a=t3.a) where t1.a=t2.a;
|
|
connection root;
|
|
revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
|
|
revoke all privileges on mysqltest.* from mysqltest_1@localhost;
|
|
delete from mysql.user where user=_binary'mysqltest_1';
|
|
drop database mysqltest;
|
|
|
|
#
|
|
# multi delete wrong table check
|
|
#
|
|
create table t1 (a int, primary key (a));
|
|
create table t2 (a int, primary key (a));
|
|
create table t3 (a int, primary key (a));
|
|
-- error 1109
|
|
delete t1,t3 from t1,t2 where t1.a=t2.a and t2.a=(select t3.a from t3 where t1.a=t3.a);
|
|
drop table t1, t2, t3;
|
|
|
|
#
|
|
# multi* unique updating table check
|
|
#
|
|
create table t1 (col1 int);
|
|
create table t2 (col1 int);
|
|
-- error 1093
|
|
update t1,t2 set t1.col1 = (select max(col1) from t1) where t1.col1 = t2.col1;
|
|
-- error 1093
|
|
delete t1 from t1,t2 where t1.col1 < (select max(col1) from t1) and t1.col1 = t2.col1;
|
|
drop table t1,t2;
|
|
|
|
# Test for BUG#5837 - delete with outer join and const tables
|
|
--disable_warnings
|
|
create table t1 (
|
|
aclid bigint not null primary key,
|
|
status tinyint(1) not null
|
|
) engine = innodb;
|
|
|
|
create table t2 (
|
|
refid bigint not null primary key,
|
|
aclid bigint, index idx_acl(aclid)
|
|
) engine = innodb;
|
|
--enable_warnings
|
|
insert into t2 values(1,null);
|
|
delete t2, t1 from t2 left join t1 on (t2.aclid=t1.aclid) where t2.refid='1';
|
|
drop table t1, t2;
|
|
|
|
# End of 4.1 tests
|