1 files changed, 0 insertions, 47 deletions
diff --git a/storage/rocksdb/mysql-test/storage_engine/type_enum_indexes.rdiff b/storage/rocksdb/mysql-test/storage_engine/type_enum_indexes.rdiff
deleted file mode 100644
index 549b67b96ed..00000000000
--- a/storage/rocksdb/mysql-test/storage_engine/type_enum_indexes.rdiff
+++ /dev/null
@@ -1,47 +0,0 @@
---- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_enum_indexes.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_enum_indexes.reject	2017-06-22 15:08:42.299665674 +0300
-@@ -21,30 +21,20 @@
- c ENUM('1a','1b','1d','1j','4a','4z','5a','5b','6v','6z') <CUSTOM_COL_OPTIONS>,
- UNIQUE KEY a_b (a,b)
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
--INSERT INTO t1 (a,b,c) VALUES
--('N.America','test1','5a'),('Europe','test1','5b'),('Europe','test2','6v'),
--('Africa','test3','4z'),('Africa','test4','1j'),('Antarctica','test4','1d');
--SHOW INDEX IN t1;
--Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
--t1	0	a_b	1	a	#	#	NULL	NULL	#	#		
--t1	0	a_b	2	b	#	#	NULL	NULL	#	#		
--EXPLAIN SELECT a FROM t1 WHERE b > 'test2' ORDER BY a;
--id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--#	#	#	#	#	a_b	#	#	#	#
--SELECT a FROM t1 WHERE b > 'test2' ORDER BY a;
--a
--Africa
--Africa
--Antarctica
--EXPLAIN SELECT a FROM t1 FORCE INDEX (a_b) WHERE b > 'test2' ORDER BY a;
--id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--#	#	#	#	#	a_b	#	#	#	#
--SELECT a FROM t1 FORCE INDEX (a_b) WHERE b > 'test2' ORDER BY a;
--a
--Africa
--Africa
--Antarctica
--DROP TABLE t1;
-+ERROR HY000: Unique index support is disabled when the table has no primary key. 
-+# ERROR: Statement ended with errno 1105, errname ER_UNKNOWN_ERROR (expected to succeed)
-+# ------------ UNEXPECTED RESULT ------------
-+# [ CREATE TABLE t1 (a ENUM('N.America','S.America','Africa','Europe','Australia','Asia','Antarctica') /*!*/ /*Custom indexed column options*/,
-+b ENUM('test1','test2','test3','test4','test5') /*!*/ /*Custom indexed column options*/,
-+c ENUM('1a','1b','1d','1j','4a','4z','5a','5b','6v','6z') /*!*/ /*Custom column options*/,
-+UNIQUE KEY a_b (a,b)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# ENUM types or unique keys or multi-part keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. 
-+# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
-+# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
-+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
-+# -------------------------------------------
- CREATE TABLE t1 (a ENUM('N.America','S.America','Africa','Europe','Australia','Asia','Antarctica') <CUSTOM_COL_OPTIONS>,
- b ENUM('test1','test2','test3','test4','test5') <CUSTOM_COL_OPTIONS>,
- c ENUM('1a','1b','1d','1j','4a','4z','5a','5b','6v','6z') <CUSTOM_COL_OPTIONS> PRIMARY KEY