mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +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
609 lines
12 KiB
Text
609 lines
12 KiB
Text
-- source include/have_ndb.inc
|
|
-- source include/not_embedded.inc
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
|
|
drop database if exists mysqltest;
|
|
--enable_warnings
|
|
|
|
#
|
|
# Basic test to show that the NDB
|
|
# table handler is working
|
|
#
|
|
|
|
#
|
|
# Create a normal table with primary key
|
|
#
|
|
CREATE TABLE t1 (
|
|
pk1 INT NOT NULL PRIMARY KEY,
|
|
attr1 INT NOT NULL,
|
|
attr2 INT,
|
|
attr3 VARCHAR(10)
|
|
) ENGINE=ndbcluster;
|
|
|
|
SHOW INDEX FROM t1;
|
|
INSERT INTO t1 VALUES (9410,9412, NULL, '9412'), (9411,9413, 17, '9413');
|
|
SHOW INDEX FROM t1;
|
|
SELECT pk1 FROM t1 ORDER BY pk1;
|
|
SELECT * FROM t1 ORDER BY pk1;
|
|
SELECT t1.* FROM t1 ORDER BY pk1;
|
|
|
|
# Update on record by primary key
|
|
UPDATE t1 SET attr1=1 WHERE pk1=9410;
|
|
SELECT * FROM t1 ORDER BY pk1;
|
|
|
|
# Update primary key
|
|
UPDATE t1 SET pk1=2 WHERE attr1=1;
|
|
SELECT * FROM t1 ORDER BY pk1;
|
|
UPDATE t1 SET pk1=pk1 + 1;
|
|
SELECT * FROM t1 ORDER BY pk1;
|
|
UPDATE t1 SET pk1=4 WHERE pk1 = 3;
|
|
SELECT * FROM t1 ORDER BY pk1;
|
|
|
|
# Delete the record
|
|
DELETE FROM t1;
|
|
SELECT * FROM t1;
|
|
|
|
# Insert more records and update them all at once
|
|
INSERT INTO t1 VALUES (9410,9412, NULL, '9412'), (9408, 8765, NULL, '8765'),
|
|
(7,8, NULL, NULL), (8,9, NULL, NULL), (9,10, NULL, NULL), (10,11, NULL, NULL), (11,12, NULL, NULL), (12,13, NULL, NULL), (13,14, NULL, NULL);
|
|
UPDATE t1 SET attr1 = 9999;
|
|
SELECT * FROM t1 ORDER BY pk1;
|
|
|
|
UPDATE t1 SET attr1 = 9998 WHERE pk1 < 1000;
|
|
SELECT * FROM t1 ORDER BY pk1;
|
|
|
|
UPDATE t1 SET attr1 = 9997 WHERE attr1 = 9999;
|
|
SELECT * FROM t1 ORDER BY pk1;
|
|
|
|
# Delete one record by specifying pk
|
|
DELETE FROM t1 WHERE pk1 = 9410;
|
|
SELECT * FROM t1 ORDER BY pk1;
|
|
|
|
# Delete all from table
|
|
DELETE FROM t1;
|
|
SELECT * FROM t1;
|
|
|
|
# Insert three records with attr1=4 and two with attr1=5
|
|
# Delete all with attr1=4
|
|
INSERT INTO t1 values (1, 4, NULL, NULL), (2, 4, NULL, NULL), (3, 5, NULL, NULL), (4, 4, NULL, NULL), (5, 5, NULL, NULL);
|
|
DELETE FROM t1 WHERE attr1=4;
|
|
SELECT * FROM t1 order by pk1;
|
|
DELETE FROM t1;
|
|
|
|
# Insert two records and delete one
|
|
INSERT INTO t1 VALUES (9410,9412, NULL, NULL), (9411, 9413, NULL, NULL);
|
|
DELETE FROM t1 WHERE pk1 = 9410;
|
|
SELECT * FROM t1;
|
|
DROP TABLE t1;
|
|
|
|
#
|
|
# Create table without primary key
|
|
# a hidden primary key column is created by handler
|
|
#
|
|
CREATE TABLE t1 (id INT, id2 int) engine=ndbcluster;
|
|
INSERT INTO t1 values(3456, 7890);
|
|
SELECT * FROM t1;
|
|
UPDATE t1 SET id=2 WHERE id2=12;
|
|
SELECT * FROM t1;
|
|
UPDATE t1 SET id=1234 WHERE id2=7890;
|
|
SELECT * FROM t1;
|
|
DELETE FROM t1;
|
|
|
|
INSERT INTO t1 values(3456, 7890), (3456, 7890), (3456, 7890), (3454, 7890);
|
|
SELECT * FROM t1 ORDER BY id;
|
|
DELETE FROM t1 WHERE id = 3456;
|
|
SELECT * FROM t1 ORDER BY id;
|
|
|
|
DROP TABLE t1;
|
|
|
|
# test create with the keyword "engine=NDBCLUSTER"
|
|
CREATE TABLE t1 (
|
|
pk1 INT NOT NULL PRIMARY KEY,
|
|
attr1 INT NOT NULL
|
|
) ENGINE=NDBCLUSTER;
|
|
|
|
INSERT INTO t1 values(1, 9999);
|
|
|
|
DROP TABLE t1;
|
|
|
|
# test create with the keyword "engine=NDB"
|
|
CREATE TABLE t1 (
|
|
pk1 INT NOT NULL PRIMARY KEY,
|
|
attr1 INT NOT NULL
|
|
) ENGINE=NDB;
|
|
|
|
INSERT INTO t1 values(1, 9999);
|
|
|
|
DROP TABLE t1;
|
|
|
|
|
|
#
|
|
# A more extensive test with a lot more records
|
|
#
|
|
|
|
CREATE TABLE t2 (
|
|
a bigint unsigned NOT NULL PRIMARY KEY,
|
|
b int unsigned not null,
|
|
c int unsigned
|
|
) engine=ndbcluster;
|
|
|
|
CREATE TABLE t3 (
|
|
a bigint unsigned NOT NULL,
|
|
b bigint unsigned not null,
|
|
c bigint unsigned,
|
|
PRIMARY KEY(a)
|
|
) engine=ndbcluster;
|
|
|
|
CREATE TABLE t4 (
|
|
a bigint unsigned NOT NULL,
|
|
b bigint unsigned not null,
|
|
c bigint unsigned NOT NULL,
|
|
d int unsigned,
|
|
PRIMARY KEY(a, b, c)
|
|
) engine=ndbcluster;
|
|
|
|
|
|
#
|
|
# insert more records into tables
|
|
#
|
|
let $1=1000;
|
|
disable_query_log;
|
|
while ($1)
|
|
{
|
|
eval insert into t2 values($1, $1+9, 5);
|
|
eval insert into t3 values($1, $1+9, 5);
|
|
eval insert into t4 values($1, $1+9, 5, $1+26000);
|
|
dec $1;
|
|
}
|
|
enable_query_log;
|
|
|
|
|
|
#
|
|
# delete every other record in the tables
|
|
#
|
|
let $1=1000;
|
|
disable_query_log;
|
|
while ($1)
|
|
{
|
|
eval delete from t2 where a=$1;
|
|
eval delete from t3 where a=$1;
|
|
eval delete from t4 where a=$1 and b=$1+9 and c=5;
|
|
dec $1;
|
|
dec $1;
|
|
}
|
|
enable_query_log;
|
|
|
|
|
|
select * from t2 where a = 7 order by b;
|
|
select * from t2 where a = 7 order by a;
|
|
select * from t2 where a = 7 order by 2;
|
|
select * from t2 where a = 7 order by c;
|
|
|
|
select * from t2 where a = 7 and b = 16 order by b;
|
|
select * from t2 where a = 7 and b = 16 order by a;
|
|
select * from t2 where a = 7 and b = 17 order by a;
|
|
select * from t2 where a = 7 and b != 16 order by b;
|
|
|
|
select * from t2 where a = 7 and b = 16 and c = 5 order by b;
|
|
select * from t2 where a = 7 and b = 16 and c = 5 order by a;
|
|
select * from t2 where a = 7 and b = 16 and c = 6 order by a;
|
|
select * from t2 where a = 7 and b != 16 and c = 5 order by b;
|
|
|
|
select * from t3 where a = 7 order by b;
|
|
select * from t3 where a = 7 order by a;
|
|
select * from t3 where a = 7 order by 2;
|
|
select * from t3 where a = 7 order by c;
|
|
|
|
select * from t3 where a = 7 and b = 16 order by b;
|
|
select * from t3 where a = 7 and b = 16 order by a;
|
|
select * from t3 where a = 7 and b = 17 order by a;
|
|
select * from t3 where a = 7 and b != 16 order by b;
|
|
|
|
select * from t4 where a = 7 order by b;
|
|
select * from t4 where a = 7 order by a;
|
|
select * from t4 where a = 7 order by 2;
|
|
select * from t4 where a = 7 order by c;
|
|
|
|
select * from t4 where a = 7 and b = 16 order by b;
|
|
select * from t4 where a = 7 and b = 16 order by a;
|
|
select * from t4 where a = 7 and b = 17 order by a;
|
|
select * from t4 where a = 7 and b != 16 order by b;
|
|
|
|
#
|
|
# update records
|
|
#
|
|
let $1=1000;
|
|
disable_query_log;
|
|
while ($1)
|
|
{
|
|
eval update t2 set c=$1 where a=$1;
|
|
eval update t3 set c=7 where a=$1 and b=$1+9 and c=5;
|
|
eval update t4 set d=$1+21987 where a=$1 and b=$1+9 and c=5;
|
|
dec $1;
|
|
dec $1;
|
|
}
|
|
enable_query_log;
|
|
|
|
delete from t2 where a > 5;
|
|
select x1.a, x1.b from t2 x1, t2 x2 where x1.b = x2.b order by x1.a;
|
|
select a, b FROM t2 outer_table where
|
|
a = (select a from t2 where b = outer_table.b ) order by a;
|
|
|
|
|
|
delete from t2;
|
|
delete from t3;
|
|
delete from t4;
|
|
|
|
drop table t2;
|
|
drop table t3;
|
|
drop table t4;
|
|
|
|
#
|
|
# Test delete and update from table with 3 keys
|
|
#
|
|
|
|
CREATE TABLE t5 (
|
|
a bigint unsigned NOT NULL,
|
|
b bigint unsigned not null,
|
|
c bigint unsigned NOT NULL,
|
|
d int unsigned,
|
|
PRIMARY KEY(a, b, c)
|
|
) engine=ndbcluster;
|
|
|
|
insert into t5 values(10, 19, 5, 26010);
|
|
|
|
delete from t5 where a=10 and b=19 and c=5;
|
|
|
|
select * from t5;
|
|
|
|
insert into t5 values(10, 19, 5, 26010);
|
|
|
|
update t5 set d=21997 where a=10 and b=19 and c=5;
|
|
|
|
select * from t5;
|
|
|
|
delete from t5;
|
|
|
|
drop table t5;
|
|
|
|
#
|
|
# Test using table with a char(255) column first in table
|
|
#
|
|
|
|
CREATE TABLE t6 (
|
|
adress char(255),
|
|
a int NOT NULL PRIMARY KEY,
|
|
b int
|
|
) engine = NDB;
|
|
|
|
insert into t6 values
|
|
("Nice road 3456", 1, 23),
|
|
("Street Road 78", 3, 92),
|
|
("Road street 89C", 5, 71),
|
|
(NULL, 7, NULL);
|
|
select * from t6 order by a;
|
|
select a, b from t6 order by a;
|
|
|
|
update t6 set adress="End of road 09" where a=3;
|
|
update t6 set b=181, adress="Street 76" where a=7;
|
|
select * from t6 order by a;
|
|
select * from t6 where a=1;
|
|
delete from t6 where a=1;
|
|
select * from t6 order by a;
|
|
delete from t6 where b=71;
|
|
select * from t6 order by a;
|
|
|
|
drop table t6;
|
|
|
|
#
|
|
# Test using table with a char(255) column first in table and a
|
|
# primary key consisting of two columns
|
|
#
|
|
|
|
CREATE TABLE t7 (
|
|
adress char(255),
|
|
a int NOT NULL,
|
|
b int,
|
|
c int NOT NULL,
|
|
PRIMARY KEY(a, c)
|
|
) engine = NDB;
|
|
|
|
insert into t7 values
|
|
("Highway 3456", 1, 23, 2),
|
|
("Street Road 78", 3, 92, 3),
|
|
("Main street 89C", 5, 71, 4),
|
|
(NULL, 8, NULL, 12);
|
|
select * from t7 order by a;
|
|
select a, b from t7 order by a;
|
|
|
|
update t7 set adress="End of road 09" where a=3;
|
|
update t7 set adress="Gatuvägen 90C" where a=5 and c=4;
|
|
update t7 set adress="No adress" where adress is NULL;
|
|
select * from t7 order by a;
|
|
select * from t7 where a=1 and c=2;
|
|
delete from t7 where a=1;
|
|
delete from t7 where a=3 and c=3;
|
|
delete from t7 where a=5 and c=4;
|
|
select * from t7;
|
|
delete from t7 where b=23;
|
|
select * from t7;
|
|
|
|
drop table t7;
|
|
|
|
#
|
|
# Test multiple databases in one statement
|
|
#
|
|
|
|
CREATE TABLE t1 (
|
|
pk1 INT NOT NULL PRIMARY KEY,
|
|
attr1 INT NOT NULL,
|
|
attr2 INT,
|
|
attr3 VARCHAR(10)
|
|
) ENGINE=ndbcluster;
|
|
|
|
INSERT INTO t1 VALUES (9410,9412, NULL, '9412'), (9411,9413, 17, '9413');
|
|
|
|
create database mysqltest;
|
|
use mysqltest;
|
|
|
|
CREATE TABLE t2 (
|
|
a bigint unsigned NOT NULL PRIMARY KEY,
|
|
b int unsigned not null,
|
|
c int unsigned
|
|
) engine=ndbcluster;
|
|
|
|
insert into t2 select pk1,attr1,attr2 from test.t1;
|
|
select * from t2 order by a;
|
|
select b from test.t1, t2 where c = test.t1.attr2;
|
|
select b,test.t1.attr1 from test.t1, t2 where test.t1.pk1 < a;
|
|
|
|
drop table test.t1, t2;
|
|
drop database mysqltest;
|
|
|
|
#
|
|
# BUG#6031 - DROP DATABASE doesn't drop database on first try
|
|
#
|
|
|
|
--disable_warnings
|
|
drop database if exists ndbtest1;
|
|
--enable_warnings
|
|
|
|
create database ndbtest1;
|
|
use ndbtest1;
|
|
create table t1(id int) engine=ndbcluster;
|
|
drop database ndbtest1;
|
|
--error 1008
|
|
drop database ndbtest1;
|
|
|
|
#
|
|
# test support of char(0)
|
|
#
|
|
|
|
use test;
|
|
create table t1 (a int primary key, b char(0));
|
|
insert into t1 values (1,"");
|
|
insert into t1 values (2,NULL);
|
|
select * from t1 order by a;
|
|
select * from t1 order by b;
|
|
select * from t1 where b IS NULL;
|
|
select * from t1 where b IS NOT NULL;
|
|
drop table t1;
|
|
|
|
#
|
|
# test the limit of no of attributes in one table
|
|
#
|
|
|
|
create table t1 (
|
|
c1 int,
|
|
c2 int,
|
|
c3 int,
|
|
c4 int,
|
|
c5 int,
|
|
c6 int,
|
|
c7 int,
|
|
c8 int,
|
|
c9 int,
|
|
c10 int,
|
|
c11 int,
|
|
c12 int,
|
|
c13 int,
|
|
c14 int,
|
|
c15 int,
|
|
c16 int,
|
|
c17 int,
|
|
c18 int,
|
|
c19 int,
|
|
c20 int,
|
|
c21 int,
|
|
c22 int,
|
|
c23 int,
|
|
c24 int,
|
|
c25 int,
|
|
c26 int,
|
|
c27 int,
|
|
c28 int,
|
|
c29 int,
|
|
c30 int,
|
|
c31 int,
|
|
c32 int,
|
|
c33 int,
|
|
c34 int,
|
|
c35 int,
|
|
c36 int,
|
|
c37 int,
|
|
c38 int,
|
|
c39 int,
|
|
c40 int,
|
|
c41 int,
|
|
c42 int,
|
|
c43 int,
|
|
c44 int,
|
|
c45 int,
|
|
c46 int,
|
|
c47 int,
|
|
c48 int,
|
|
c49 int,
|
|
c50 int,
|
|
c51 int,
|
|
c52 int,
|
|
c53 int,
|
|
c54 int,
|
|
c55 int,
|
|
c56 int,
|
|
c57 int,
|
|
c58 int,
|
|
c59 int,
|
|
c60 int,
|
|
c61 int,
|
|
c62 int,
|
|
c63 int,
|
|
c64 int,
|
|
c65 int,
|
|
c66 int,
|
|
c67 int,
|
|
c68 int,
|
|
c69 int,
|
|
c70 int,
|
|
c71 int,
|
|
c72 int,
|
|
c73 int,
|
|
c74 int,
|
|
c75 int,
|
|
c76 int,
|
|
c77 int,
|
|
c78 int,
|
|
c79 int,
|
|
c80 int,
|
|
c81 int,
|
|
c82 int,
|
|
c83 int,
|
|
c84 int,
|
|
c85 int,
|
|
c86 int,
|
|
c87 int,
|
|
c88 int,
|
|
c89 int,
|
|
c90 int,
|
|
c91 int,
|
|
c92 int,
|
|
c93 int,
|
|
c94 int,
|
|
c95 int,
|
|
c96 int,
|
|
c97 int,
|
|
c98 int,
|
|
c99 int,
|
|
c100 int,
|
|
c101 int,
|
|
c102 int,
|
|
c103 int,
|
|
c104 int,
|
|
c105 int,
|
|
c106 int,
|
|
c107 int,
|
|
c108 int,
|
|
c109 int,
|
|
c110 int,
|
|
c111 int,
|
|
c112 int,
|
|
c113 int,
|
|
c114 int,
|
|
c115 int,
|
|
c116 int,
|
|
c117 int,
|
|
c118 int,
|
|
c119 int,
|
|
c120 int,
|
|
c121 int,
|
|
c122 int,
|
|
c123 int,
|
|
c124 int,
|
|
c125 int,
|
|
c126 int,
|
|
c127 int,
|
|
c128 int,
|
|
primary key(c1)) engine=ndb;
|
|
drop table t1;
|
|
|
|
#
|
|
# test max size of attribute name and truncation
|
|
#
|
|
|
|
create table t1 (
|
|
a1234567890123456789012345678901234567890 int primary key,
|
|
a12345678901234567890123456789a1234567890 int,
|
|
index(a12345678901234567890123456789a1234567890)
|
|
) engine=ndb;
|
|
show tables;
|
|
insert into t1 values (1,1),(2,1),(3,1),(4,1),(5,2),(6,1),(7,1);
|
|
explain select * from t1 where a12345678901234567890123456789a1234567890=2;
|
|
select * from t1 where a12345678901234567890123456789a1234567890=2;
|
|
drop table t1;
|
|
|
|
#
|
|
# test fragment creation
|
|
#
|
|
# first a table with _many_ fragments per node group
|
|
# then a table with just one fragment per node group
|
|
#
|
|
create table t1
|
|
(a bigint, b bigint, c bigint, d bigint,
|
|
primary key (a,b,c,d))
|
|
engine=ndb
|
|
max_rows=200000000;
|
|
insert into t1 values
|
|
(1,2,3,4),(2,3,4,5),(3,4,5,6),
|
|
(3,2,3,4),(1,3,4,5),(2,4,5,6),
|
|
(1,2,3,5),(2,3,4,8),(3,4,5,9),
|
|
(3,2,3,5),(1,3,4,8),(2,4,5,9),
|
|
(1,2,3,6),(2,3,4,6),(3,4,5,7),
|
|
(3,2,3,6),(1,3,4,6),(2,4,5,7),
|
|
(1,2,3,7),(2,3,4,7),(3,4,5,8),
|
|
(3,2,3,7),(1,3,4,7),(2,4,5,8),
|
|
(1,3,3,4),(2,4,4,5),(3,5,5,6),
|
|
(3,3,3,4),(1,4,4,5),(2,5,5,6),
|
|
(1,3,3,5),(2,4,4,8),(3,5,5,9),
|
|
(3,3,3,5),(1,4,4,8),(2,5,5,9),
|
|
(1,3,3,6),(2,4,4,6),(3,5,5,7),
|
|
(3,3,3,6),(1,4,4,6),(2,5,5,7),
|
|
(1,3,3,7),(2,4,4,7),(3,5,5,8),
|
|
(3,3,3,7),(1,4,4,7),(2,5,5,8);
|
|
select count(*) from t1;
|
|
drop table t1;
|
|
|
|
create table t1
|
|
(a bigint, b bigint, c bigint, d bigint,
|
|
primary key (a))
|
|
engine=ndb
|
|
max_rows=1;
|
|
drop table t1;
|
|
|
|
#
|
|
# Test auto_increment
|
|
#
|
|
|
|
connect (con1,localhost,,,test);
|
|
connect (con2,localhost,,,test);
|
|
|
|
create table t1
|
|
(counter int(64) NOT NULL auto_increment,
|
|
datavalue char(40) default 'XXXX',
|
|
primary key (counter)
|
|
) ENGINE=ndbcluster;
|
|
|
|
connection con1;
|
|
insert into t1 (datavalue) values ('newval');
|
|
insert into t1 (datavalue) values ('newval');
|
|
select * from t1 order by counter;
|
|
insert into t1 (datavalue) select datavalue from t1 where counter < 100;
|
|
insert into t1 (datavalue) select datavalue from t1 where counter < 100;
|
|
select * from t1 order by counter;
|
|
connection con2;
|
|
insert into t1 (datavalue) select datavalue from t1 where counter < 100;
|
|
insert into t1 (datavalue) select datavalue from t1 where counter < 100;
|
|
select * from t1 order by counter;
|
|
|
|
drop table t1;
|
|
|
|
# End of 4.1 tests
|