• unknown's avatar
    Added end marker for tests to make future merges easier · 167fb5f1
    unknown authored
    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
    167fb5f1
func_encrypt.test 4.93 KB
-- source include/have_openssl.inc

--disable_warnings
drop table if exists t1;
--enable_warnings

create table t1 (x blob);
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('a','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','a'));
insert into t1 values (des_encrypt('ab','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','ab'));
insert into t1 values (des_encrypt('abc','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abc'));
insert into t1 values (des_encrypt('abcd','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcd'));
insert into t1 values (des_encrypt('abcde','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcde'));
insert into t1 values (des_encrypt('abcdef','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdef'));
insert into t1 values (des_encrypt('abcdefg','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdefg'));
insert into t1 values (des_encrypt('abcdefgh','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdefgh'));
insert into t1 values (des_encrypt('abcdefghi','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdefghi'));
insert into t1 values (des_encrypt('abcdefghij','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdefghij'));
insert into t1 values (des_encrypt('abcdefghijk','The quick red fox jumped over the lazy brown dog'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','abcdefghijk'));
insert into t1 values (des_encrypt('The quick red fox jumped over the lazy brown dog','sabakala'));
insert into t1 values (des_encrypt('quick red fox jumped over the lazy brown dog','sabakala'));
insert into t1 values (des_encrypt('red fox jumped over the lazy brown dog','sabakala'));
insert into t1 values (des_encrypt('fox jumped over the lazy brown dog','sabakala'));
insert into t1 values (des_encrypt('jumped over the lazy brown dog','sabakala'));
insert into t1 values (des_encrypt('over the lazy brown dog','sabakala'));
insert into t1 values (des_encrypt('the lazy brown dog','sabakala'));
insert into t1 values (des_encrypt('lazy brown dog','sabakala'));
insert into t1 values (des_encrypt('brown dog','sabakala'));
insert into t1 values (des_encrypt('dog','sabakala'));
insert into t1 values (des_encrypt('dog!','sabakala'));
insert into t1 values (des_encrypt('dog!!','sabakala'));
insert into t1 values (des_encrypt('dog!!!','sabakala'));
insert into t1 values (des_encrypt('dog!!!!','sabakala'));
insert into t1 values (des_encrypt('dog!!!!!','sabakala'));
insert into t1 values (des_encrypt('jumped over the lazy brown dog','sabakala'));
insert into t1 values (des_encrypt('jumped over the lazy brown dog','sabakala'));
select hex(x), hex(des_decrypt(x,'sabakala')) from t1;
select des_decrypt(x,'sabakala') as s from t1 having s like '%dog%';
drop table t1;

#
# Test default keys
#
select hex(des_encrypt("hello")),des_decrypt(des_encrypt("hello"));
select des_decrypt(des_encrypt("hello",4));
select des_decrypt(des_encrypt("hello",'test'),'test');
select hex(des_encrypt("hello")),hex(des_encrypt("hello",5)),hex(des_encrypt("hello",'default_password'));
select des_decrypt(des_encrypt("hello"),'default_password');
select des_decrypt(des_encrypt("hello",4),'password4');

# Test use of invalid parameters
select des_encrypt("hello",10);
select des_encrypt(NULL);
select des_encrypt(NULL, 10);
select des_encrypt(NULL, NULL);
select des_encrypt(10, NULL);
select des_encrypt("hello", NULL);

select des_decrypt("hello",10);
select des_decrypt(NULL);
select des_decrypt(NULL, 10);
select des_decrypt(NULL, NULL);
select des_decrypt(10, NULL);
select des_decrypt("hello", NULL);


# Test flush
SET @a=des_decrypt(des_encrypt("hello"));
flush des_key_file;
select @a = des_decrypt(des_encrypt("hello"));

# Test usage of wrong password
select hex("hello");
select hex(des_decrypt(des_encrypt("hello",4),'password2'));
select hex(des_decrypt(des_encrypt("hello","hidden")));

explain extended select des_decrypt(des_encrypt("hello",4),'password2'), des_decrypt(des_encrypt("hello","hidden"));

# End of 4.1 tests