mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +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
364 lines
9.5 KiB
Text
364 lines
9.5 KiB
Text
#
|
||
# Test of alter table
|
||
#
|
||
--disable_warnings
|
||
drop table if exists t1,t2;
|
||
drop database if exists mysqltest;
|
||
--enable_warnings
|
||
|
||
create table t1 (
|
||
col1 int not null auto_increment primary key,
|
||
col2 varchar(30) not null,
|
||
col3 varchar (20) not null,
|
||
col4 varchar(4) not null,
|
||
col5 enum('PENDING', 'ACTIVE', 'DISABLED') not null,
|
||
col6 int not null, to_be_deleted int);
|
||
insert into t1 values (2,4,3,5,"PENDING",1,7);
|
||
alter table t1
|
||
add column col4_5 varchar(20) not null after col4,
|
||
add column col7 varchar(30) not null after col5,
|
||
add column col8 datetime not null, drop column to_be_deleted,
|
||
change column col2 fourth varchar(30) not null after col3,
|
||
modify column col6 int not null first;
|
||
select * from t1;
|
||
drop table t1;
|
||
|
||
create table t1 (bandID MEDIUMINT UNSIGNED NOT NULL PRIMARY KEY, payoutID SMALLINT UNSIGNED NOT NULL);
|
||
insert into t1 (bandID,payoutID) VALUES (1,6),(2,6),(3,4),(4,9),(5,10),(6,1),(7,12),(8,12);
|
||
alter table t1 add column new_col int, order by payoutid,bandid;
|
||
select * from t1;
|
||
alter table t1 order by bandid,payoutid;
|
||
select * from t1;
|
||
drop table t1;
|
||
|
||
# Check that pack_keys and dynamic length rows are not forced.
|
||
|
||
CREATE TABLE t1 (
|
||
GROUP_ID int(10) unsigned DEFAULT '0' NOT NULL,
|
||
LANG_ID smallint(5) unsigned DEFAULT '0' NOT NULL,
|
||
NAME varchar(80) DEFAULT '' NOT NULL,
|
||
PRIMARY KEY (GROUP_ID,LANG_ID),
|
||
KEY NAME (NAME));
|
||
#show table status like "t1";
|
||
ALTER TABLE t1 CHANGE NAME NAME CHAR(80) not null;
|
||
--replace_column 8 #
|
||
SHOW FULL COLUMNS FROM t1;
|
||
DROP TABLE t1;
|
||
|
||
#
|
||
# Test of ALTER TABLE ... ORDER BY
|
||
#
|
||
|
||
create table t1 (n int);
|
||
insert into t1 values(9),(3),(12),(10);
|
||
alter table t1 order by n;
|
||
select * from t1;
|
||
drop table t1;
|
||
|
||
CREATE TABLE t1 (
|
||
id int(11) unsigned NOT NULL default '0',
|
||
category_id tinyint(4) unsigned NOT NULL default '0',
|
||
type_id tinyint(4) unsigned NOT NULL default '0',
|
||
body text NOT NULL,
|
||
user_id int(11) unsigned NOT NULL default '0',
|
||
status enum('new','old') NOT NULL default 'new',
|
||
PRIMARY KEY (id)
|
||
) ENGINE=MyISAM;
|
||
|
||
ALTER TABLE t1 ORDER BY t1.id, t1.status, t1.type_id, t1.user_id, t1.body;
|
||
DROP TABLE t1;
|
||
|
||
#
|
||
# The following combination found a hang-bug in MyISAM
|
||
#
|
||
|
||
CREATE TABLE t1 (AnamneseId int(10) unsigned NOT NULL auto_increment,B BLOB,PRIMARY KEY (AnamneseId)) engine=myisam;
|
||
insert into t1 values (null,"hello");
|
||
LOCK TABLES t1 WRITE;
|
||
ALTER TABLE t1 ADD Column new_col int not null;
|
||
UNLOCK TABLES;
|
||
OPTIMIZE TABLE t1;
|
||
DROP TABLE t1;
|
||
|
||
#
|
||
# Drop and add an auto_increment column
|
||
#
|
||
|
||
create table t1 (i int unsigned not null auto_increment primary key);
|
||
insert into t1 values (null),(null),(null),(null);
|
||
alter table t1 drop i,add i int unsigned not null auto_increment, drop primary key, add primary key (i);
|
||
select * from t1;
|
||
drop table t1;
|
||
|
||
#
|
||
# Bug #2628: 'alter table t1 rename mysqltest.t1' silently drops mysqltest.t1
|
||
# if it exists
|
||
#
|
||
create table t1 (name char(15));
|
||
insert into t1 (name) values ("current");
|
||
create database mysqltest;
|
||
create table mysqltest.t1 (name char(15));
|
||
insert into mysqltest.t1 (name) values ("mysqltest");
|
||
select * from t1;
|
||
select * from mysqltest.t1;
|
||
--error 1050
|
||
alter table t1 rename mysqltest.t1;
|
||
select * from t1;
|
||
select * from mysqltest.t1;
|
||
drop table t1;
|
||
drop database mysqltest;
|
||
|
||
#
|
||
# ALTER TABLE ... ENABLE/DISABLE KEYS
|
||
|
||
create table t1 (n1 int not null, n2 int, n3 int, n4 float,
|
||
unique(n1),
|
||
key (n1, n2, n3, n4),
|
||
key (n2, n3, n4, n1),
|
||
key (n3, n4, n1, n2),
|
||
key (n4, n1, n2, n3) );
|
||
alter table t1 disable keys;
|
||
show keys from t1;
|
||
#let $1=10000;
|
||
let $1=10;
|
||
while ($1)
|
||
{
|
||
eval insert into t1 values($1,RAND()*1000,RAND()*1000,RAND());
|
||
dec $1;
|
||
}
|
||
alter table t1 enable keys;
|
||
show keys from t1;
|
||
drop table t1;
|
||
|
||
#
|
||
# Alter table and rename
|
||
#
|
||
|
||
create table t1 (i int unsigned not null auto_increment primary key);
|
||
alter table t1 rename t2;
|
||
alter table t2 rename t1, add c char(10) comment "no comment";
|
||
show columns from t1;
|
||
drop table t1;
|
||
|
||
# implicit analyze
|
||
|
||
create table t1 (a int, b int);
|
||
let $1=100;
|
||
while ($1)
|
||
{
|
||
eval insert into t1 values(1,$1), (2,$1), (3, $1);
|
||
dec $1;
|
||
}
|
||
alter table t1 add unique (a,b), add key (b);
|
||
show keys from t1;
|
||
analyze table t1;
|
||
show keys from t1;
|
||
drop table t1;
|
||
|
||
#
|
||
# Test of ALTER TABLE DELAYED
|
||
#
|
||
|
||
CREATE TABLE t1 (i int(10), index(i) );
|
||
ALTER TABLE t1 DISABLE KEYS;
|
||
INSERT DELAYED INTO t1 VALUES(1),(2),(3);
|
||
ALTER TABLE t1 ENABLE KEYS;
|
||
drop table t1;
|
||
|
||
#
|
||
# Test ALTER TABLE ENABLE/DISABLE keys when things are locked
|
||
#
|
||
|
||
CREATE TABLE t1 (
|
||
Host varchar(16) binary NOT NULL default '',
|
||
User varchar(16) binary NOT NULL default '',
|
||
PRIMARY KEY (Host,User)
|
||
) ENGINE=MyISAM;
|
||
|
||
ALTER TABLE t1 DISABLE KEYS;
|
||
LOCK TABLES t1 WRITE;
|
||
INSERT INTO t1 VALUES ('localhost','root'),('localhost',''),('games','monty');
|
||
SHOW INDEX FROM t1;
|
||
ALTER TABLE t1 ENABLE KEYS;
|
||
UNLOCK TABLES;
|
||
CHECK TABLES t1;
|
||
DROP TABLE t1;
|
||
|
||
#
|
||
# Test with two keys
|
||
#
|
||
|
||
CREATE TABLE t1 (
|
||
Host varchar(16) binary NOT NULL default '',
|
||
User varchar(16) binary NOT NULL default '',
|
||
PRIMARY KEY (Host,User),
|
||
KEY (Host)
|
||
) ENGINE=MyISAM;
|
||
|
||
ALTER TABLE t1 DISABLE KEYS;
|
||
SHOW INDEX FROM t1;
|
||
LOCK TABLES t1 WRITE;
|
||
INSERT INTO t1 VALUES ('localhost','root'),('localhost','');
|
||
SHOW INDEX FROM t1;
|
||
ALTER TABLE t1 ENABLE KEYS;
|
||
SHOW INDEX FROM t1;
|
||
UNLOCK TABLES;
|
||
CHECK TABLES t1;
|
||
|
||
# Test RENAME with LOCK TABLES
|
||
LOCK TABLES t1 WRITE;
|
||
ALTER TABLE t1 RENAME t2;
|
||
UNLOCK TABLES;
|
||
select * from t2;
|
||
DROP TABLE t2;
|
||
|
||
#
|
||
# Test disable keys with locking
|
||
#
|
||
CREATE TABLE t1 (
|
||
Host varchar(16) binary NOT NULL default '',
|
||
User varchar(16) binary NOT NULL default '',
|
||
PRIMARY KEY (Host,User),
|
||
KEY (Host)
|
||
) ENGINE=MyISAM;
|
||
|
||
LOCK TABLES t1 WRITE;
|
||
ALTER TABLE t1 DISABLE KEYS;
|
||
SHOW INDEX FROM t1;
|
||
DROP TABLE t1;
|
||
|
||
#
|
||
# BUG#4717 - check for valid table names
|
||
#
|
||
create table t1 (a int);
|
||
--error 1103
|
||
alter table t1 rename to `t1\\`;
|
||
--error 1103
|
||
rename table t1 to `t1\\`;
|
||
drop table t1;
|
||
|
||
#
|
||
# BUG#6236 - ALTER TABLE MODIFY should set implicit NOT NULL on PK columns
|
||
#
|
||
drop table if exists t1, t2;
|
||
create table t1 ( a varchar(10) not null primary key ) engine=myisam;
|
||
create table t2 ( a varchar(10) not null primary key ) engine=merge union=(t1);
|
||
flush tables;
|
||
alter table t1 modify a varchar(10);
|
||
show create table t2;
|
||
flush tables;
|
||
alter table t1 modify a varchar(10) not null;
|
||
show create table t2;
|
||
drop table if exists t1, t2;
|
||
|
||
# The following is also part of bug #6236 (CREATE TABLE didn't properly count
|
||
# not null columns for primary keys)
|
||
|
||
create table t1 (a int, b int, c int, d int, e int, f int, g int, h int,i int, primary key (a,b,c,d,e,f,g,i,h)) engine=MyISAM;
|
||
insert into t1 (a) values(1);
|
||
--replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X
|
||
show table status like 't1';
|
||
alter table t1 modify a int;
|
||
--replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X
|
||
show table status like 't1';
|
||
drop table t1;
|
||
create table t1 (a int not null, b int not null, c int not null, d int not null, e int not null, f int not null, g int not null, h int not null,i int not null, primary key (a,b,c,d,e,f,g,i,h)) engine=MyISAM;
|
||
insert into t1 (a) values(1);
|
||
--replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X
|
||
show table status like 't1';
|
||
drop table t1;
|
||
|
||
#
|
||
# Test that data get converted when character set is changed
|
||
# Test that data doesn't get converted when src or dst is BINARY/BLOB
|
||
#
|
||
set names koi8r;
|
||
create table t1 (a char(10) character set koi8r);
|
||
insert into t1 values ('<27><><EFBFBD><EFBFBD>');
|
||
select a,hex(a) from t1;
|
||
alter table t1 change a a char(10) character set cp1251;
|
||
select a,hex(a) from t1;
|
||
alter table t1 change a a binary(10);
|
||
select a,hex(a) from t1;
|
||
alter table t1 change a a char(10) character set cp1251;
|
||
select a,hex(a) from t1;
|
||
alter table t1 change a a char(10) character set koi8r;
|
||
select a,hex(a) from t1;
|
||
alter table t1 change a a varchar(10) character set cp1251;
|
||
select a,hex(a) from t1;
|
||
alter table t1 change a a char(10) character set koi8r;
|
||
select a,hex(a) from t1;
|
||
alter table t1 change a a text character set cp1251;
|
||
select a,hex(a) from t1;
|
||
alter table t1 change a a char(10) character set koi8r;
|
||
select a,hex(a) from t1;
|
||
delete from t1;
|
||
|
||
#
|
||
# Test ALTER TABLE .. CHARACTER SET ..
|
||
#
|
||
show create table t1;
|
||
alter table t1 DEFAULT CHARACTER SET latin1;
|
||
show create table t1;
|
||
alter table t1 CONVERT TO CHARACTER SET latin1;
|
||
show create table t1;
|
||
alter table t1 DEFAULT CHARACTER SET cp1251;
|
||
show create table t1;
|
||
|
||
drop table t1;
|
||
|
||
#
|
||
# Bug#2821
|
||
# Test that table CHARACTER SET does not affect blobs
|
||
#
|
||
create table t1 (myblob longblob,mytext longtext)
|
||
default charset latin1 collate latin1_general_cs;
|
||
show create table t1;
|
||
alter table t1 character set latin2;
|
||
show create table t1;
|
||
drop table t1;
|
||
|
||
#
|
||
# Bug 2361 (Don't drop UNIQUE with DROP PRIMARY KEY)
|
||
#
|
||
|
||
CREATE TABLE t1 (a int PRIMARY KEY, b INT UNIQUE);
|
||
ALTER TABLE t1 DROP PRIMARY KEY;
|
||
SHOW CREATE TABLE t1;
|
||
--error 1091
|
||
ALTER TABLE t1 DROP PRIMARY KEY;
|
||
DROP TABLE t1;
|
||
|
||
# BUG#3899
|
||
create table t1 (a int, b int, key(a));
|
||
insert into t1 values (1,1), (2,2);
|
||
--error 1091
|
||
alter table t1 drop key no_such_key;
|
||
alter table t1 drop key a;
|
||
drop table t1;
|
||
|
||
#
|
||
# Bug #6479 ALTER TABLE ... changing charset fails for TEXT columns
|
||
#
|
||
# The column's character set was changed but the actual data was not
|
||
# modified. In other words, the values were reinterpreted
|
||
# as UTF8 instead of being converted.
|
||
create table t1 (a text) character set koi8r;
|
||
insert into t1 values (_koi8r'<27><><EFBFBD><EFBFBD>');
|
||
select hex(a) from t1;
|
||
alter table t1 convert to character set cp1251;
|
||
select hex(a) from t1;
|
||
drop table t1;
|
||
|
||
#
|
||
# Test for bug #7884 "Able to add invalid unique index on TIMESTAMP prefix"
|
||
# MySQL should not think that packed field with non-zero decimals is
|
||
# geometry field and allow to create prefix index which is
|
||
# shorter than packed field length.
|
||
#
|
||
create table t1 ( a timestamp );
|
||
--error 1089
|
||
alter table t1 add unique ( a(1) );
|
||
drop table t1;
|
||
|
||
# End of 4.1 tests
|