mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +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
321 lines
11 KiB
Text
321 lines
11 KiB
Text
-- source include/have_ndb.inc
|
|
-- source include/not_embedded.inc
|
|
|
|
--disable_warnings
|
|
drop table if exists t1, test1, test2;
|
|
--enable_warnings
|
|
|
|
#
|
|
# Simple test to show use of ordered indexes
|
|
#
|
|
|
|
CREATE TABLE t1 (
|
|
a int unsigned NOT NULL PRIMARY KEY,
|
|
b int unsigned not null,
|
|
c int unsigned,
|
|
KEY(b)
|
|
) engine=ndbcluster;
|
|
|
|
insert t1 values(1, 2, 3), (2,3, 5), (3, 4, 6), (4, 5, 8), (5,6, 2), (6,7, 2);
|
|
select * from t1 order by b;
|
|
select * from t1 where b >= 4 order by b;
|
|
select * from t1 where b = 4 order by b;
|
|
select * from t1 where b > 4 order by b;
|
|
select * from t1 where b < 4 order by b;
|
|
select * from t1 where b <= 4 order by b;
|
|
|
|
# Test of reset_bounds
|
|
select tt1.* from t1 as tt1, t1 as tt2 use index(b) where tt1.b = tt2.b order by tt1.b;
|
|
select a, b, c from t1 where a!=2 and c=6;
|
|
select a, b, c from t1 where a!=2 order by a;
|
|
|
|
#
|
|
# Here we should add some "explain select" to verify that the ordered index is
|
|
# used for these queries.
|
|
#
|
|
|
|
#
|
|
# Update using ordered index scan
|
|
#
|
|
|
|
update t1 set c = 3 where b = 3;
|
|
select * from t1 order by a;
|
|
update t1 set c = 10 where b >= 6;
|
|
select * from t1 order by a;
|
|
update t1 set c = 11 where b < 5;
|
|
select * from t1 order by a;
|
|
update t1 set c = 12 where b > 0;
|
|
select * from t1 order by a;
|
|
update t1 set c = 13 where b <= 3;
|
|
select * from t1 order by a;
|
|
update t1 set b = b + 1 where b > 4 and b < 7;
|
|
select * from t1 order by a;
|
|
-- Update primary key
|
|
update t1 set a = a + 10 where b > 1 and b < 7;
|
|
select * from t1 order by a;
|
|
|
|
#
|
|
# Delete using ordered index scan
|
|
#
|
|
|
|
drop table t1;
|
|
|
|
CREATE TABLE t1 (
|
|
a int unsigned NOT NULL PRIMARY KEY,
|
|
b int unsigned not null,
|
|
c int unsigned,
|
|
KEY(b)
|
|
) engine=ndbcluster;
|
|
|
|
insert t1 values(1, 2, 13), (2,3, 13), (3, 4, 12), (4, 5, 12), (5,6, 12), (6,7, 12);
|
|
|
|
delete from t1 where b = 3;
|
|
select * from t1 order by a;
|
|
delete from t1 where b >= 6;
|
|
select * from t1 order by a;
|
|
delete from t1 where b < 4;
|
|
select * from t1 order by a;
|
|
delete from t1 where b > 5;
|
|
select * from t1 order by a;
|
|
delete from t1 where b <= 4;
|
|
select * from t1 order by a;
|
|
|
|
drop table t1;
|
|
|
|
|
|
#
|
|
#multi part key
|
|
#
|
|
CREATE TABLE t1 (
|
|
a int unsigned NOT NULL PRIMARY KEY,
|
|
b int unsigned not null,
|
|
c int unsigned not null
|
|
) engine = ndb;
|
|
|
|
create index a1 on t1 (b, c);
|
|
|
|
insert into t1 values (1, 2, 13);
|
|
insert into t1 values (2,3, 13);
|
|
insert into t1 values (3, 4, 12);
|
|
insert into t1 values (4, 5, 12);
|
|
insert into t1 values (5,6, 12);
|
|
insert into t1 values (6,7, 12);
|
|
insert into t1 values (7, 2, 1);
|
|
insert into t1 values (8,3, 6);
|
|
insert into t1 values (9, 4, 12);
|
|
insert into t1 values (14, 5, 4);
|
|
insert into t1 values (15,5,5);
|
|
insert into t1 values (16,5, 6);
|
|
insert into t1 values (17,4,4);
|
|
insert into t1 values (18,1, 7);
|
|
|
|
|
|
|
|
select * from t1 order by a;
|
|
select * from t1 where b<=5 order by a;
|
|
select * from t1 where b<=5 and c=0;
|
|
insert into t1 values (19,4, 0);
|
|
select * from t1 where b<=5 and c=0;
|
|
select * from t1 where b=4 and c<=5 order by a;
|
|
select * from t1 where b<=4 and c<=5 order by a;
|
|
select * from t1 where b<=5 and c=0 or b<=5 and c=2;
|
|
|
|
select count(*) from t1 where b = 0;
|
|
select count(*) from t1 where b = 1;
|
|
drop table t1;
|
|
|
|
#
|
|
# Indexing NULL values
|
|
#
|
|
|
|
CREATE TABLE t1 (
|
|
a int unsigned NOT NULL PRIMARY KEY,
|
|
b int unsigned,
|
|
c int unsigned,
|
|
KEY bc(b,c)
|
|
) engine = ndb;
|
|
|
|
insert into t1 values(1,1,1),(2,NULL,2),(3,NULL,NULL),(4,4,NULL);
|
|
select * from t1 use index (bc) where b IS NULL order by a;
|
|
|
|
select * from t1 use index (bc)order by a;
|
|
select * from t1 use index (bc) order by a;
|
|
select * from t1 use index (PRIMARY) where b IS NULL order by a;
|
|
select * from t1 use index (bc) where b IS NULL order by a;
|
|
select * from t1 use index (bc) where b IS NULL and c IS NULL order by a;
|
|
select * from t1 use index (bc) where b IS NULL and c = 2 order by a;
|
|
select * from t1 use index (bc) where b < 4 order by a;
|
|
select * from t1 use index (bc) where b IS NOT NULL order by a;
|
|
drop table t1;
|
|
|
|
#
|
|
# Bug #6435
|
|
CREATE TABLE test1 (
|
|
SubscrID int(11) NOT NULL auto_increment,
|
|
UsrID int(11) NOT NULL default '0',
|
|
PRIMARY KEY (SubscrID),
|
|
KEY idx_usrid (UsrID)
|
|
) ENGINE=ndbcluster DEFAULT CHARSET=latin1;
|
|
|
|
INSERT INTO test1 VALUES (2,224),(3,224),(1,224);
|
|
|
|
CREATE TABLE test2 (
|
|
SbclID int(11) NOT NULL auto_increment,
|
|
SbcrID int(11) NOT NULL default '0',
|
|
PRIMARY KEY (SbclID),
|
|
KEY idx_sbcrid (SbcrID)
|
|
) ENGINE=ndbcluster DEFAULT CHARSET=latin1;
|
|
|
|
INSERT INTO test2 VALUES (3,2),(1,1),(2,1),(4,2);
|
|
select * from test1 order by 1;
|
|
select * from test2 order by 1;
|
|
SELECT s.SubscrID,l.SbclID FROM test1 s left JOIN test2 l ON
|
|
l.SbcrID=s.SubscrID WHERE s.UsrID=224 order by 1, 2;
|
|
drop table test1;
|
|
drop table test2;
|
|
|
|
# bug#7424 + bug#7725
|
|
|
|
create table t1 (
|
|
pk int primary key,
|
|
dt datetime not null,
|
|
da date not null,
|
|
ye year not null,
|
|
ti time not null,
|
|
ts timestamp not null,
|
|
index(dt),
|
|
index(da),
|
|
index(ye),
|
|
index(ti),
|
|
index(ts)
|
|
) engine=ndb;
|
|
|
|
insert into t1 (pk,dt,da,ye,ti,ts) values
|
|
(1, '1901-05-05 23:00:59', '1901-05-05', '1901', '23:00:59', '2001-01-01 23:00:59'),
|
|
(2, '1912-09-05 13:00:59', '1912-09-05', '1912', '13:00:59', '2001-01-01 13:00:59'),
|
|
(3, '1945-12-31 00:00:00', '1945-12-31', '1945', '00:00:00', '2001-01-01 00:00:00'),
|
|
(4, '1955-12-31 00:00:00', '1955-12-31', '1955', '00:00:00', '2001-01-01 00:00:00'),
|
|
(5, '1963-06-06 06:06:06', '1963-06-06', '1963', '06:06:06', '2001-01-01 06:06:06'),
|
|
(6, '1993-06-06 06:06:06', '1993-06-06', '1993', '06:06:06', '2001-01-01 06:06:06'),
|
|
(7, '2001-01-01 10:11:10', '2001-01-01', '2001', '10:11:10', '2001-01-01 10:11:10'),
|
|
(8, '2001-01-01 10:11:11', '2001-01-01', '2001', '10:11:11', '2001-01-01 10:11:11'),
|
|
(9, '2005-01-31 23:59:59', '2005-01-31', '2005', '23:59:59', '2001-01-01 23:59:59');
|
|
|
|
# datetime
|
|
select count(*)-9 from t1 use index (dt) where dt > '1900-01-01 00:00:00';
|
|
select count(*)-6 from t1 use index (dt) where dt >= '1955-12-31 00:00:00';
|
|
select count(*)-5 from t1 use index (dt) where dt > '1955-12-31 00:00:00';
|
|
select count(*)-5 from t1 use index (dt) where dt < '1970-03-03 22:22:22';
|
|
select count(*)-7 from t1 use index (dt) where dt < '2001-01-01 10:11:11';
|
|
select count(*)-8 from t1 use index (dt) where dt <= '2001-01-01 10:11:11';
|
|
select count(*)-9 from t1 use index (dt) where dt <= '2055-01-01 00:00:00';
|
|
|
|
# date
|
|
select count(*)-9 from t1 use index (da) where da > '1900-01-01';
|
|
select count(*)-6 from t1 use index (da) where da >= '1955-12-31';
|
|
select count(*)-5 from t1 use index (da) where da > '1955-12-31';
|
|
select count(*)-5 from t1 use index (da) where da < '1970-03-03';
|
|
select count(*)-6 from t1 use index (da) where da < '2001-01-01';
|
|
select count(*)-8 from t1 use index (da) where da <= '2001-01-02';
|
|
select count(*)-9 from t1 use index (da) where da <= '2055-01-01';
|
|
|
|
# year
|
|
select count(*)-9 from t1 use index (ye) where ye > '1900';
|
|
select count(*)-6 from t1 use index (ye) where ye >= '1955';
|
|
select count(*)-5 from t1 use index (ye) where ye > '1955';
|
|
select count(*)-5 from t1 use index (ye) where ye < '1970';
|
|
select count(*)-6 from t1 use index (ye) where ye < '2001';
|
|
select count(*)-8 from t1 use index (ye) where ye <= '2001';
|
|
select count(*)-9 from t1 use index (ye) where ye <= '2055';
|
|
|
|
# time
|
|
select count(*)-9 from t1 use index (ti) where ti >= '00:00:00';
|
|
select count(*)-7 from t1 use index (ti) where ti > '00:00:00';
|
|
select count(*)-7 from t1 use index (ti) where ti > '05:05:05';
|
|
select count(*)-5 from t1 use index (ti) where ti > '06:06:06';
|
|
select count(*)-5 from t1 use index (ti) where ti < '10:11:11';
|
|
select count(*)-6 from t1 use index (ti) where ti <= '10:11:11';
|
|
select count(*)-8 from t1 use index (ti) where ti < '23:59:59';
|
|
select count(*)-9 from t1 use index (ti) where ti <= '23:59:59';
|
|
|
|
# timestamp
|
|
select count(*)-9 from t1 use index (ts) where ts >= '2001-01-01 00:00:00';
|
|
select count(*)-7 from t1 use index (ts) where ts > '2001-01-01 00:00:00';
|
|
select count(*)-7 from t1 use index (ts) where ts > '2001-01-01 05:05:05';
|
|
select count(*)-5 from t1 use index (ts) where ts > '2001-01-01 06:06:06';
|
|
select count(*)-5 from t1 use index (ts) where ts < '2001-01-01 10:11:11';
|
|
select count(*)-6 from t1 use index (ts) where ts <= '2001-01-01 10:11:11';
|
|
select count(*)-8 from t1 use index (ts) where ts < '2001-01-01 23:59:59';
|
|
select count(*)-9 from t1 use index (ts) where ts <= '2001-01-01 23:59:59';
|
|
|
|
drop table t1;
|
|
|
|
# decimal (not the new 5.0 thing)
|
|
|
|
create table t1 (
|
|
a int primary key,
|
|
s decimal(12),
|
|
t decimal(12, 5),
|
|
u decimal(12) unsigned,
|
|
v decimal(12, 5) unsigned,
|
|
key (s),
|
|
key (t),
|
|
key (u),
|
|
key (v)
|
|
) engine=ndb;
|
|
#
|
|
insert into t1 values
|
|
( 0, -000000000007, -0000061.00003, 000000000061, 0000965.00042),
|
|
( 1, -000000000007, -0000061.00042, 000000000061, 0000965.00003),
|
|
( 2, -071006035767, 4210253.00024, 000000000001, 0000001.84488),
|
|
( 3, 000000007115, 0000000.77607, 000077350625, 0000018.00013),
|
|
( 4, -000000068391, -0346486.00000, 000000005071, 0005334.00002),
|
|
( 5, -521579890459, -1936874.00001, 000000000154, 0000003.00018),
|
|
( 6, -521579890459, -1936874.00018, 000000000154, 0000003.00001),
|
|
( 7, 000000000333, 0000051.39140, 000000907958, 0788643.08374),
|
|
( 8, 000042731229, 0000009.00000, 000000000009, 6428667.00000),
|
|
( 9, -000008159769, 0000918.00004, 000096951421, 7607730.00008);
|
|
#
|
|
select count(*)- 5 from t1 use index (s) where s < -000000000007;
|
|
select count(*)- 7 from t1 use index (s) where s <= -000000000007;
|
|
select count(*)- 2 from t1 use index (s) where s = -000000000007;
|
|
select count(*)- 5 from t1 use index (s) where s >= -000000000007;
|
|
select count(*)- 3 from t1 use index (s) where s > -000000000007;
|
|
#
|
|
select count(*)- 4 from t1 use index (t) where t < -0000061.00003;
|
|
select count(*)- 5 from t1 use index (t) where t <= -0000061.00003;
|
|
select count(*)- 1 from t1 use index (t) where t = -0000061.00003;
|
|
select count(*)- 6 from t1 use index (t) where t >= -0000061.00003;
|
|
select count(*)- 5 from t1 use index (t) where t > -0000061.00003;
|
|
#
|
|
select count(*)- 2 from t1 use index (u) where u < 000000000061;
|
|
select count(*)- 4 from t1 use index (u) where u <= 000000000061;
|
|
select count(*)- 2 from t1 use index (u) where u = 000000000061;
|
|
select count(*)- 8 from t1 use index (u) where u >= 000000000061;
|
|
select count(*)- 6 from t1 use index (u) where u > 000000000061;
|
|
#
|
|
select count(*)- 5 from t1 use index (v) where v < 0000965.00042;
|
|
select count(*)- 6 from t1 use index (v) where v <= 0000965.00042;
|
|
select count(*)- 1 from t1 use index (v) where v = 0000965.00042;
|
|
select count(*)- 5 from t1 use index (v) where v >= 0000965.00042;
|
|
select count(*)- 4 from t1 use index (v) where v > 0000965.00042;
|
|
|
|
drop table t1;
|
|
|
|
# bug#7798
|
|
create table t1(a int primary key, b int not null, index(b));
|
|
insert into t1 values (1,1), (2,2);
|
|
connect (con1,localhost,,,test);
|
|
connect (con2,localhost,,,test);
|
|
connection con1;
|
|
set autocommit=0;
|
|
begin;
|
|
select count(*) from t1;
|
|
connection con2;
|
|
ALTER TABLE t1 ADD COLUMN c int;
|
|
connection con1;
|
|
select a from t1 where b = 2;
|
|
show tables;
|
|
drop table t1;
|
|
|
|
# End of 4.1 tests
|