Changes to RocksDB tests after the engine merge

88879b37 · Elena Stepanova · d24f76e1 · 88879b37 · d24f76e1 · 88879b37
Commit 88879b37 authored Aug 14, 2017 by Elena Stepanova
19 changed files
--- a/storage/rocksdb/mysql-test/storage_engine/index.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/index.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/index.result	2017-06-22 00:33:46.419995639 +0300
+--- suite/storage_engine/index.result	2017-03-12 04:57:07.169911845 +0200
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/index.reject	2017-06-22 13:55:28.615693291 +0300
+++ suite/storage_engine/index.reject	2017-08-14 22:41:06.548555663 +0300
 @@ -4,7 +4,7 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 SHOW KEYS IN t1;
@@ -20,7 +20,7 @@
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
 b <CHAR_COLUMN>,
-@@ -22,46 +22,48 @@
+@@ -22,8 +22,8 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 SHOW KEYS IN t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
@@ -31,32 +31,16 @@
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
 b <CHAR_COLUMN>,
- UNIQUE INDEX (a)
+@@ -31,7 +31,7 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-SHOW KEYS IN t1;
+ SHOW KEYS IN t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+ Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 -t1	0	a	1	a	#	#	NULL	NULL	#	BTREE		
-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
+t1	0	a	1	a	#	#	NULL	NULL	#	LSMTREE		
-INSERT INTO t1 (a,b) VALUES (1,'c');
+ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
-ERROR 23000: Duplicate entry '1' for key 'a'
+ INSERT INTO t1 (a,b) VALUES (1,'c');
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
+ ERROR 23000: Duplicate entry '1' for key 'a'
-# If you got a difference in error message, just add it to rdiff file
+@@ -43,7 +43,7 @@
-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 INT(11) /*!*/ /*Custom indexed column options*/,
-+b CHAR(8) /*!*/ /*Custom column options*/,
-+UNIQUE INDEX  (a)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Unique indexes 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 <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
- INSERT INTO t1 (a,b) VALUES (100,'z');
 ALTER TABLE t1 ADD <CUSTOM_INDEX> (a) COMMENT 'simple index on a';
 SHOW INDEX FROM t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
@@ -65,34 +49,12 @@
 ALTER TABLE t1 DROP KEY a;
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
- b <CHAR_COLUMN>,
+@@ -52,7 +52,7 @@
- UNIQUE INDEX (a)
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-SHOW KEYS IN t1;
+ SHOW KEYS IN t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+ Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 -t1	0	a	1	a	#	#	NULL	NULL	#	BTREE		
-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
+t1	0	a	1	a	#	#	NULL	NULL	#	LSMTREE		
-INSERT INTO t1 (a,b) VALUES (1,'c');
+ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
-ERROR 23000: Duplicate entry '1' for key 'a'
+ INSERT INTO t1 (a,b) VALUES (1,'c');
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
+ ERROR 23000: Duplicate entry '1' for key 'a'
-# If you got a difference in error message, just add it to rdiff file
-ALTER TABLE t1 DROP INDEX a;
-INSERT INTO t1 (a,b) VALUES (1,'c');
-ALTER TABLE t1 ADD UNIQUE INDEX a(a) ;
-ERROR 23000: Duplicate entry '1' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-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 INT(11) /*!*/ /*Custom indexed column options*/,
-+b CHAR(8) /*!*/ /*Custom column options*/,
-+UNIQUE INDEX  (a)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Unique indexes 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).
-+# -------------------------------------------
--- a/storage/rocksdb/mysql-test/storage_engine/index_key_block_size.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/index_key_block_size.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/index_key_block_size.result	2017-06-22 00:33:46.419995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/index_key_block_size.reject	2017-06-22 13:56:59.503692719 +0300
-@@ -19,10 +19,19 @@
- b <CHAR_COLUMN>,
- UNIQUE INDEX ind2(b(1) DESC) KEY_BLOCK_SIZE=32768 COMMENT 'big key_block_size value'
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	ind2	1	b	#	#	1	NULL	#	#		big key_block_size value
-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 INT(11) /*!*/ /*Custom column options*/,
-+b CHAR(8) /*!*/ /*Custom indexed column options*/,
-+UNIQUE INDEX ind2(b(1) DESC) KEY_BLOCK_SIZE=32768 COMMENT 'big key_block_size value'
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Unique keys on char columns 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 <INT_COLUMN>,
- b <CHAR_COLUMN>,
- <CUSTOM_INDEX> a_b(a,b) KEY_BLOCK_SIZE=8192
--- a/storage/rocksdb/mysql-test/storage_engine/index_type_btree.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/index_type_btree.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/index_type_btree.result	2017-06-22 00:33:46.419995639 +0300
+--- suite/storage_engine/index_type_btree.result	2017-03-12 04:57:07.169911845 +0200
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/index_type_btree.reject	2017-06-22 13:58:02.359692324 +0300
+++ suite/storage_engine/index_type_btree.reject	2017-08-14 22:50:47.264555216 +0300
 @@ -4,7 +4,7 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 SHOW KEYS IN t1;
@@ -20,7 +20,7 @@
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
 b <CHAR_COLUMN>,
-@@ -22,46 +22,48 @@
+@@ -22,8 +22,8 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 SHOW KEYS IN t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
@@ -31,32 +31,16 @@
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
 b <CHAR_COLUMN>,
- UNIQUE INDEX USING BTREE (a)
+@@ -31,7 +31,7 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-SHOW KEYS IN t1;
+ SHOW KEYS IN t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+ Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 -t1	0	a	1	a	#	#	NULL	NULL	#	BTREE		
-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
+t1	0	a	1	a	#	#	NULL	NULL	#	LSMTREE		
-INSERT INTO t1 (a,b) VALUES (1,'c');
+ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
-ERROR 23000: Duplicate entry '1' for key 'a'
+ INSERT INTO t1 (a,b) VALUES (1,'c');
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
+ ERROR 23000: Duplicate entry '1' for key 'a'
-# If you got a difference in error message, just add it to rdiff file
+@@ -43,7 +43,7 @@
-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 INT(11) /*!*/ /*Custom indexed column options*/,
-+b CHAR(8) /*!*/ /*Custom column options*/,
-+UNIQUE INDEX USING BTREE (a)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Unique indexes 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 <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
- INSERT INTO t1 (a,b) VALUES (100,'z');
 ALTER TABLE t1 ADD <CUSTOM_INDEX> (a) USING BTREE COMMENT 'simple index on a';
 SHOW INDEX FROM t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
@@ -65,34 +49,12 @@
 ALTER TABLE t1 DROP KEY a;
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
- b <CHAR_COLUMN>,
+@@ -52,7 +52,7 @@
- UNIQUE INDEX USING BTREE (a)
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-SHOW KEYS IN t1;
+ SHOW KEYS IN t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+ Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 -t1	0	a	1	a	#	#	NULL	NULL	#	BTREE		
-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
+t1	0	a	1	a	#	#	NULL	NULL	#	LSMTREE		
-INSERT INTO t1 (a,b) VALUES (1,'c');
+ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
-ERROR 23000: Duplicate entry '1' for key 'a'
+ INSERT INTO t1 (a,b) VALUES (1,'c');
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
+ ERROR 23000: Duplicate entry '1' for key 'a'
-# If you got a difference in error message, just add it to rdiff file
-ALTER TABLE t1 DROP INDEX a;
-INSERT INTO t1 (a,b) VALUES (1,'c');
-ALTER TABLE t1 ADD UNIQUE INDEX a(a) USING BTREE;
-ERROR 23000: Duplicate entry '1' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-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 INT(11) /*!*/ /*Custom indexed column options*/,
-+b CHAR(8) /*!*/ /*Custom column options*/,
-+UNIQUE INDEX USING BTREE (a)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Unique indexes 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).
-+# -------------------------------------------
--- a/storage/rocksdb/mysql-test/storage_engine/index_type_hash.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/index_type_hash.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/index_type_hash.result	2017-06-22 00:33:46.419995639 +0300
+--- suite/storage_engine/index_type_hash.result	2017-03-12 04:57:07.169911845 +0200
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/index_type_hash.reject	2017-06-22 14:00:42.867691315 +0300
+++ suite/storage_engine/index_type_hash.reject	2017-08-14 22:51:55.644555163 +0300
 @@ -4,7 +4,7 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 SHOW KEYS IN t1;
@@ -20,7 +20,7 @@
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
 b <CHAR_COLUMN>,
-@@ -22,46 +22,48 @@
+@@ -22,8 +22,8 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 SHOW KEYS IN t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
@@ -31,32 +31,16 @@
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
 b <CHAR_COLUMN>,
- UNIQUE INDEX USING HASH (a)
+@@ -31,7 +31,7 @@
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-SHOW KEYS IN t1;
+ SHOW KEYS IN t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+ Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 -t1	0	a	1	a	#	#	NULL	NULL	#	HASH		
-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
+t1	0	a	1	a	#	#	NULL	NULL	#	LSMTREE		
-INSERT INTO t1 (a,b) VALUES (1,'c');
+ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
-ERROR 23000: Duplicate entry '1' for key 'a'
+ INSERT INTO t1 (a,b) VALUES (1,'c');
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
+ ERROR 23000: Duplicate entry '1' for key 'a'
-# If you got a difference in error message, just add it to rdiff file
+@@ -43,7 +43,7 @@
-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 INT(11) /*!*/ /*Custom indexed column options*/,
-+b CHAR(8) /*!*/ /*Custom column options*/,
-+UNIQUE INDEX USING HASH (a)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Unique indexes 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 <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
- INSERT INTO t1 (a,b) VALUES (100,'z');
 ALTER TABLE t1 ADD <CUSTOM_INDEX> (a) USING HASH COMMENT 'simple index on a';
 SHOW INDEX FROM t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
@@ -65,34 +49,12 @@
 ALTER TABLE t1 DROP KEY a;
 DROP TABLE t1;
 CREATE TABLE t1 (a <INT_COLUMN>,
- b <CHAR_COLUMN>,
+@@ -52,7 +52,7 @@
- UNIQUE INDEX USING HASH (a)
 ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-SHOW KEYS IN t1;
+ SHOW KEYS IN t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+ Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 -t1	0	a	1	a	#	#	NULL	NULL	#	HASH		
-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
+t1	0	a	1	a	#	#	NULL	NULL	#	LSMTREE		
-INSERT INTO t1 (a,b) VALUES (1,'c');
+ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
-ERROR 23000: Duplicate entry '1' for key 'a'
+ INSERT INTO t1 (a,b) VALUES (1,'c');
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
+ ERROR 23000: Duplicate entry '1' for key 'a'
-# If you got a difference in error message, just add it to rdiff file
-ALTER TABLE t1 DROP INDEX a;
-INSERT INTO t1 (a,b) VALUES (1,'c');
-ALTER TABLE t1 ADD UNIQUE INDEX a(a) USING HASH;
-ERROR 23000: Duplicate entry '1' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-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 INT(11) /*!*/ /*Custom indexed column options*/,
-+b CHAR(8) /*!*/ /*Custom column options*/,
-+UNIQUE INDEX USING HASH (a)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Unique indexes 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).
-+# -------------------------------------------
--- a/storage/rocksdb/mysql-test/storage_engine/insert_with_keys.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/insert_with_keys.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/insert_with_keys.result	2017-06-22 00:33:46.419995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/insert_with_keys.reject	2017-06-22 14:01:57.539690846 +0300
-@@ -22,93 +22,27 @@
- 6	f
- DROP TABLE t1;
- CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, UNIQUE INDEX(a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e');
-INSERT INTO t1 (a,b) VALUES (100,'a'), (6,'f');
-INSERT INTO t1 (a,b) VALUES (30,'m'),(29,'n');
-INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
-ERROR 23000: Duplicate entry '1' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-INSERT INTO t1 (a,b) VALUES (3,'a'),(0,'');
-ERROR 23000: Duplicate entry '3' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-INSERT INTO t1 (a,b) VALUES (0,'');
-SELECT a,b FROM t1;
-a	b
-0	
-1	a
-100	a
-2	b
-29	n
-3	c
-30	m
-4	d
-5	e
-6	f
-INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
-Warnings:
-Warning	1062	Duplicate entry '1' for key 'a'
-INSERT INTO t1 (a,b) VALUES (3,'a'),(4,'d') ON DUPLICATE KEY UPDATE a = a+10;
-SELECT a,b FROM t1;
-a	b
-0	
-1	a
-100	a
-12345	z
-13	c
-14	d
-2	b
-29	n
-30	m
-5	e
-6	f
-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 INT(11) /*!*/ /*Custom indexed column options*/, b CHAR(8) /*!*/ /*Custom column options*/, UNIQUE INDEX(a)) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Unique indexes 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 <INT_COLUMN>, b <CHAR_COLUMN>, UNIQUE INDEX(a,b)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e');
-INSERT INTO t1 (a,b) VALUES (100,'a'), (6,'f');
-INSERT INTO t1 (a,b) VALUES (30,'m'),(29,'n');
-INSERT INTO t1 (a,b) VALUES (100,'b'), (2,'c');
-INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
-ERROR 23000: Duplicate entry '1-a' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-SELECT a,b FROM t1;
-a	b
-1	a
-100	a
-100	b
-2	b
-2	c
-29	n
-3	c
-30	m
-4	d
-5	e
-6	f
-INSERT IGNORE INTO t1 (a,b) VALUES (1,'a'),(12345,'z');
-Warnings:
-Warning	1062	Duplicate entry '1-a' for key 'a'
-INSERT INTO t1 (a,b) VALUES (1,'a'),(12345,'z') ON DUPLICATE KEY UPDATE a = a+VALUES(a);
-SELECT a,b FROM t1;
-a	b
-100	a
-100	b
-2	a
-2	b
-2	c
-24690	z
-29	n
-3	c
-30	m
-4	d
-5	e
-6	f
-INSERT INTO t1 (a,b) VALUES (101,'x'),(101,'x');
-ERROR 23000: Duplicate entry '101-x' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-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 INT(11) /*!*/ /*Custom indexed column options*/, b CHAR(8) /*!*/ /*Custom indexed column options*/, UNIQUE INDEX(a,b)) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Multi-part indexes 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 <INT_COLUMN> PRIMARY KEY, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
- INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e');
- INSERT INTO t1 (a,b) VALUES (100,'a'), (6,'f');
-@@ -153,21 +87,13 @@
- 6	f
- DROP TABLE t1;
- CREATE TABLE t1 (a <INT_COLUMN> UNIQUE KEY, b <INT_COLUMN> UNIQUE KEY, c <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-INSERT INTO t1 VALUES(1,1,0);
-INSERT INTO t1 VALUES(2,3,0);
-INSERT INTO t1 VALUES(3,2,0);
-INSERT INTO t1 VALUES(1,1,0) ON DUPLICATE KEY UPDATE c=c+1;
-INSERT INTO t1 VALUES(2,3,0) ON DUPLICATE KEY UPDATE c=c+1;
-INSERT INTO t1 VALUES(3,2,0) ON DUPLICATE KEY UPDATE c=c+1;
-INSERT INTO t1 VALUES(2,5,0) ON DUPLICATE KEY UPDATE c=c+1;
-INSERT INTO t1 VALUES(3,5,0) ON DUPLICATE KEY UPDATE c=c+1;
-INSERT INTO t1 VALUES(5,3,0) ON DUPLICATE KEY UPDATE c=c+1;
-INSERT INTO t1 VALUES(6,2,0) ON DUPLICATE KEY UPDATE c=c+1;
-INSERT INTO t1 VALUES(1,3,0) ON DUPLICATE KEY UPDATE c=c+1;
-INSERT INTO t1 VALUES(2,2,0) ON DUPLICATE KEY UPDATE c=c+1;
-SELECT * FROM t1;
-a	b	c
-1	1	2
-2	3	4
-3	2	3
-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 INT(11) /*!*/ /*Custom indexed column options*/ UNIQUE KEY, b INT(11) /*!*/ /*Custom indexed column options*/ UNIQUE KEY, c INT(11) /*!*/ /*Custom column options*/) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Multiple unique 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).
-+# -------------------------------------------
--- a/storage/rocksdb/mysql-test/storage_engine/replace.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/replace.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/replace.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/replace.reject	2017-06-22 14:03:14.971690359 +0300
-@@ -20,18 +20,16 @@
- 5	e
- DROP TABLE t1;
- CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, UNIQUE INDEX (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-REPLACE INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c');
-INSERT INTO t1 (a,b) VALUES (2,'d');
-ERROR 23000: Duplicate entry '2' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-REPLACE INTO t1 (a,b) VALUES (2,'d');
-SELECT a,b FROM t1;
-a	b
-1	a
-2	d
-3	c
-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 INT(11) /*!*/ /*Custom indexed column options*/, b CHAR(8) /*!*/ /*Custom column options*/, UNIQUE INDEX (a)) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Unique 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 <INT_COLUMN>, b <CHAR_COLUMN>, PRIMARY KEY (b)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
- REPLACE INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c');
- INSERT INTO t1 (a,b) VALUES (4,'b');
--- a/storage/rocksdb/mysql-test/storage_engine/show_engine.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/show_engine.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/show_engine.result	2017-06-22 00:33:46.423995639 +0300
+--- suite/storage_engine/show_engine.result	2017-03-12 04:57:07.169911845 +0200
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/show_engine.reject	2017-06-22 15:24:52.547659575 +0300
+++ suite/storage_engine/show_engine.reject	2017-08-14 22:58:15.508554871 +0300
-@@ -4,7 +4,10 @@
+@@ -4,7 +4,11 @@
 # volatile data (timestamps, memory info, etc.)
 SHOW ENGINE <STORAGE_ENGINE> STATUS;
 Type	Name	Status
 -<STORAGE_ENGINE>		### Engine status, can be long and changeable ###
+STATISTICS	<STORAGE_ENGINE>	### Engine status, can be long and changeable ###
 +DBSTATS	<STORAGE_ENGINE>	### Engine status, can be long and changeable ###
 +CF_COMPACTION	__system__	### Engine status, can be long and changeable ###
 +CF_COMPACTION	default	### Engine status, can be long and changeable ###
-+Memory_Stats	<STORAGE_ENGINE>	### Engine status, can be long and changeable ###
+MEMORY_STATS	<STORAGE_ENGINE>	### Engine status, can be long and changeable ###
 # For SHOW MUTEX even the number of lines is volatile, so the result logging is disabled,
 # the test only checks that the command does not produce any errors
 SHOW ENGINE <STORAGE_ENGINE> MUTEX;
--- a/storage/rocksdb/mysql-test/storage_engine/type_binary_indexes.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/type_binary_indexes.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_binary_indexes.result	2017-06-22 15:31:43.719656991 +0300
+--- suite/storage_engine/type_binary_indexes.result	2017-03-12 04:57:07.173911845 +0200
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_binary_indexes.reject	2017-06-22 15:32:27.007656719 +0300
+++ suite/storage_engine/type_binary_indexes.reject	2017-08-14 22:54:02.144555066 +0300
-@@ -50,34 +50,21 @@
+@@ -91,7 +91,7 @@
- v128 VARBINARY(128) <CUSTOM_COL_OPTIONS>,
+ INSERT INTO t1 (b,b20,v16,v128) SELECT b,b20,v16,v128 FROM t1;
- UNIQUE INDEX b_v (b,v128)
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	b_v	1	b	#	#	NULL	NULL	#	#		
-t1	0	b_v	2	v128	#	#	NULL	NULL	#	#		
-INSERT INTO t1 (b,b20,v16,v128) VALUES ('a','char1','varchar1a','varchar1b'),('a','char2','varchar2a','varchar2b'),('b','char3','varchar1a','varchar1b'),('c','char4','varchar3a','varchar3b');
-EXPLAIN SELECT HEX(b), HEX(v128) FROM t1 WHERE b != 'a' AND v128 > 'varchar';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	b_v	#	#	#	#
-SELECT HEX(b), HEX(v128) FROM t1 WHERE b != 'a' AND v128 > 'varchar';
-HEX(b)	HEX(v128)
-62	766172636861723162
-63	766172636861723362
-EXPLAIN SELECT HEX(b), HEX(v128) FROM t1 USE INDEX (b_v) WHERE b != 'a' AND v128 > 'varchar';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	b_v	#	#	#	#
-SELECT HEX(b), HEX(v128) FROM t1 USE INDEX (b_v) WHERE b != 'a' AND v128 > 'varchar';
-HEX(b)	HEX(v128)
-62	766172636861723162
-63	766172636861723362
-EXPLAIN SELECT HEX(v128), COUNT(*) FROM t1 GROUP BY HEX(v128);
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	b_v	#	#	#	#
-SELECT HEX(v128), COUNT(*) FROM t1 GROUP BY HEX(v128);
-HEX(v128)	COUNT(*)
-766172636861723162	2
-766172636861723262	1
-766172636861723362	1
-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 (b BINARY /*!*/ /*Custom indexed column options*/,
-+b20 BINARY(20) /*!*/ /*Custom column options*/,
-+v16 VARBINARY(16) /*!*/ /*Custom column options*/,
-+v128 VARBINARY(128) /*!*/ /*Custom indexed column options*/,
-+UNIQUE INDEX b_v (b,v128)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# BINARY or VARBINARY 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 (b BINARY <CUSTOM_COL_OPTIONS>,
- b20 BINARY(20) <CUSTOM_COL_OPTIONS>,
- v16 VARBINARY(16) <CUSTOM_COL_OPTIONS>,
-@@ -92,7 +79,7 @@
- ANALYZE TABLE t1;
 EXPLAIN SELECT HEX(SUBSTRING(v16,0,3)) FROM t1 WHERE v16 LIKE 'varchar%';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 -#	#	#	#	#	NULL	#	#	#	#

--- a/storage/rocksdb/mysql-test/storage_engine/type_bit_indexes.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/type_bit_indexes.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_bit_indexes.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_bit_indexes.reject	2017-06-22 14:07:37.807688707 +0300
-@@ -59,30 +59,21 @@
- d BIT(64) <CUSTOM_COL_OPTIONS>,
- UNIQUE INDEX b_c (b,c)
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	b_c	1	b	#	#	NULL	NULL	#	#		
-t1	0	b_c	2	c	#	#	NULL	NULL	#	#		
-INSERT INTO t1 (a,b,c,d) VALUES
-(0,0xFFFFF,0,1),(0,256,0xAAA,0x12345),(1,16,0,0xFFFFFFF),(0,11,12,13),
-(1,100,101,102),(0,12,13,14),(1,13,14,15),(0,101,201,202),(1,1000,1001,1002),
-(1,0xFFFF,0xFFFFFFFF,0xFFFFFFFFFFFFFFFF);
-EXPLAIN SELECT HEX(b+c) FROM t1 WHERE c > 1 OR HEX(b) < 0xFFFFFF;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	b_c	#	#	#	#
-SELECT HEX(b+c) FROM t1 WHERE c > 1 OR HEX(b) < 0xFFFFFF;
-HEX(b+c)
-10
-10000FFFE
-12E
-17
-19
-1B
-7D1
-BAA
-C9
-FFFFF
-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 BIT /*!*/ /*Custom column options*/,
-+b BIT(20) /*!*/ /*Custom indexed column options*/,
-+c BIT(32) /*!*/ /*Custom indexed column options*/,
-+d BIT(64) /*!*/ /*Custom column options*/,
-+UNIQUE INDEX b_c (b,c)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# BIT 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 BIT <CUSTOM_COL_OPTIONS>,
- b BIT(20) <CUSTOM_COL_OPTIONS>,
- c BIT(32) <CUSTOM_COL_OPTIONS>,
-@@ -110,23 +101,18 @@
- d BIT(64) <CUSTOM_COL_OPTIONS>,
- UNIQUE INDEX (d)
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	d	1	d	#	#	NULL	NULL	#	#		
-INSERT INTO t1 (a,b,c,d) VALUES
-(0,0xFFFFF,0,1),(0,256,0xAAA,0x12345),(1,16,0,0xFFFFFFF),(0,11,12,13),
-(1,100,101,102),(0,12,13,14),(1,13,14,15),(0,101,201,202),(1,1000,1001,1002),
-(1,0xFFFF,0xFFFFFFFF,0xFFFFFFFFFFFFFFFF);
-EXPLAIN SELECT d FROM t1 WHERE d BETWEEN 1 AND 10000;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	d	#	#	#	#
-SELECT d+0 FROM t1 WHERE d BETWEEN 1 AND 10000;
-d+0
-1
-1002
-102
-13
-14
-15
-202
-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 BIT /*!*/ /*Custom column options*/,
-+b BIT(20) /*!*/ /*Custom column options*/,
-+c BIT(32) /*!*/ /*Custom column options*/,
-+d BIT(64) /*!*/ /*Custom indexed column options*/,
-+UNIQUE INDEX (d)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# BIT types or unique 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).
-+# -------------------------------------------
--- a/storage/rocksdb/mysql-test/storage_engine/type_blob_indexes.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/type_blob_indexes.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_blob_indexes.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_blob_indexes.reject	2017-06-22 14:09:07.227688145 +0300
-@@ -71,53 +71,21 @@
- l LONGBLOB <CUSTOM_COL_OPTIONS>,
- UNIQUE INDEX l_t (l(256),t(64))
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	l_t	1	l	#	#	256	NULL	#	#		
-t1	0	l_t	2	t	#	#	64	NULL	#	#		
-INSERT INTO t1 (b,t,m,l) VALUES
-('','','',''),
-('a','b','c','d'),
-('b','d','c','b'),
-('test1','test2','test3','test4'),
-(REPEAT('a',128),REPEAT('b',128),REPEAT('c',128),REPEAT('d',128)),
-(HEX('abcd'),HEX('def'),HEX('a'),HEX('abc')),
-('abc','def','ghi','jkl'),
-('test2','test3','test4','test5'),
-('test3','test4','test5','test6'),
-(REPEAT('b',128),REPEAT('f',128),REPEAT('e',128),REPEAT('d',128)),
-(REPEAT('c',128),REPEAT('b',128),REPEAT('c',128),REPEAT('e',128));
-EXPLAIN SELECT SUBSTRING(t,64), SUBSTRING(l,256) FROM t1 WHERE t!=l AND l NOT IN ('test1') ORDER BY t, l DESC;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	l_t	#	#	#	#	#
-SELECT SUBSTRING(t,64), SUBSTRING(l,256) FROM t1 WHERE t!=l AND l NOT IN ('test1') ORDER BY t, l DESC;
-SUBSTRING(t,64)	SUBSTRING(l,256)
-	
-	
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	
-	
-	
-fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff	
-	
-	
-	
-EXPLAIN SELECT SUBSTRING(t,64), SUBSTRING(l,256) FROM t1 FORCE INDEX (l_t) WHERE t!=l AND l NOT IN ('test1') ORDER BY t, l DESC;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	l_t	#	#	#	#	#
-SELECT SUBSTRING(t,64), SUBSTRING(l,256) FROM t1 FORCE INDEX (l_t) WHERE t!=l AND l NOT IN ('test1') ORDER BY t, l DESC;
-SUBSTRING(t,64)	SUBSTRING(l,256)
-	
-	
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	
-	
-	
-fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff	
-	
-	
-	
-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 (b BLOB /*!*/ /*Custom column options*/,
-+t TINYBLOB /*!*/ /*Custom indexed column options*/,
-+m MEDIUMBLOB /*!*/ /*Custom column options*/,
-+l LONGBLOB /*!*/ /*Custom indexed column options*/,
-+UNIQUE INDEX l_t (l(256),t(64))
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# BLOB types or unique indexes or multi-part indexes 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 (b BLOB <CUSTOM_COL_OPTIONS>,
- t TINYBLOB <CUSTOM_COL_OPTIONS>,
- m MEDIUMBLOB <CUSTOM_COL_OPTIONS>,
--- a/storage/rocksdb/mysql-test/storage_engine/type_char_indexes.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/type_char_indexes.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_char_indexes.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_char_indexes.reject	2017-06-22 14:10:08.479687760 +0300
-@@ -67,46 +67,21 @@
- v128 VARCHAR(128) <CUSTOM_COL_OPTIONS>,
- UNIQUE INDEX c_v (c,v128)
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	c_v	1	c	#	#	NULL	NULL	#	#		
-t1	0	c_v	2	v128	#	#	NULL	NULL	#	#		
-INSERT INTO t1 (c,c20,v16,v128) VALUES ('a','char1','varchar1a','varchar1b'),('a','char2','varchar2a','varchar2b'),('b','char3','varchar1a','varchar1b'),('c','char4','varchar3a','varchar3b');
-EXPLAIN SELECT c, v128 FROM t1 WHERE c != 'a' AND v128 > 'varchar';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	c_v	#	#	#	#
-SELECT c, v128 FROM t1 WHERE c != 'a' AND v128 > 'varchar';
-c	v128
-b	varchar1b
-c	varchar3b
-EXPLAIN SELECT v128, COUNT(*) FROM t1 GROUP BY v128;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	c_v	#	#	#	#
-SELECT v128, COUNT(*) FROM t1 GROUP BY v128;
-v128	COUNT(*)
-varchar1b	2
-varchar2b	1
-varchar3b	1
-EXPLAIN SELECT v128, COUNT(*) FROM t1 USE INDEX FOR GROUP BY (c_v) GROUP BY v128;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	c_v	#	#	#	#
-SELECT v128, COUNT(*) FROM t1 USE INDEX FOR GROUP BY (c_v) GROUP BY v128;
-v128	COUNT(*)
-varchar1b	2
-varchar2b	1
-varchar3b	1
-SET SESSION optimizer_switch = 'engine_condition_pushdown=on';
-Warnings:
-Warning	1681	'engine_condition_pushdown=on' is deprecated and will be removed in a future release
-EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	range	c_v	c_v	#	#	#	Using index condition
-SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a';
-c	c20	v16	v128
-b	char3	varchar1a	varchar1b
-c	char4	varchar3a	varchar3b
-SET SESSION optimizer_switch = @@global.optimizer_switch;
-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 (c CHAR /*!*/ /*Custom indexed column options*/,
-+c20 CHAR(20) /*!*/ /*Custom column options*/,
-+v16 VARCHAR(16) /*!*/ /*Custom column options*/,
-+v128 VARCHAR(128) /*!*/ /*Custom indexed column options*/,
-+UNIQUE INDEX c_v (c,v128)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# CHAR or VARCHAR 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 (c CHAR <CUSTOM_COL_OPTIONS>,
- c20 CHAR(20) <CUSTOM_COL_OPTIONS>,
- v16 VARCHAR(16) <CUSTOM_COL_OPTIONS>,
--- a/storage/rocksdb/mysql-test/storage_engine/type_date_time_indexes.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/type_date_time_indexes.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_date_time_indexes.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_date_time_indexes.reject	2017-06-22 15:05:44.883666789 +0300
-@@ -194,46 +194,22 @@
- y YEAR <CUSTOM_COL_OPTIONS>,
- UNIQUE INDEX d_t (d,t)
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	d_t	1	d	#	#	NULL	NULL	#	#		
-t1	0	d_t	2	t	#	#	NULL	NULL	#	#		
-SET @tm = '2012-04-09 05:27:00';
-INSERT INTO t1 (d,dt,ts,t,y) VALUES
-('2012-01-12', '2010-11-22 12:33:54', '2011-11-14 21:45:55', '00:12:33', '2000'),
-('2012-01-12', '2010-11-22 11:43:14', '2011-11-14 21:45:55', '00:12:32', '2001'),
-('2012-03-31', '2011-08-28 21:33:56', '1999-04-30 19:11:08', '12:00:00', '1999'),
-('2012-03-13', '2011-08-27 21:33:56', '1999-03-30 19:11:08', '12:10:00', '1998'),
-('2011-03-31', '2011-08-28 20:33:56', '1997-01-31 11:54:01', '22:04:10', '1994'),
-(DATE(@tm),@tm,TIMESTAMP(@tm),TIME(@tm),YEAR(@tm));
-EXPLAIN SELECT d, t FROM t1 WHERE CONCAT(d,' ',t) != CURRENT_DATE();
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	d_t	#	#	#	#
-SELECT d, t FROM t1 WHERE CONCAT(d,' ',t) != CURRENT_DATE();
-d	t
-2011-03-31	22:04:10
-2012-01-12	00:12:32
-2012-01-12	00:12:33
-2012-03-13	12:10:00
-2012-03-31	12:00:00
-2012-04-09	05:27:00
-EXPLAIN SELECT d, t FROM t1 IGNORE INDEX (d_t) WHERE CONCAT(d,' ',t) != CURRENT_DATE();
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	NULL	#	#	#	#
-SELECT d, t FROM t1 IGNORE INDEX (d_t) WHERE CONCAT(d,' ',t) != CURRENT_DATE();
-d	t
-2011-03-31	22:04:10
-2012-01-12	00:12:32
-2012-01-12	00:12:33
-2012-03-13	12:10:00
-2012-03-31	12:00:00
-2012-04-09	05:27:00
-INSERT INTO t1 (d,dt,ts,t,y) VALUES
-('2012-01-12', '2010-11-22 12:33:53', '2011-11-14 21:45:55', '00:12:33', '2000');
-ERROR 23000: Duplicate entry '2012-01-12-00:12:33' for key 'd_t'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-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 (d DATE /*!*/ /*Custom indexed column options*/,
-+dt DATETIME /*!*/ /*Custom column options*/,
-+ts TIMESTAMP /*!*/ /*Custom column options*/,
-+t TIME /*!*/ /*Custom indexed column options*/,
-+y YEAR /*!*/ /*Custom column options*/,
-+UNIQUE INDEX d_t (d,t)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Date and time 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 (d DATE <CUSTOM_COL_OPTIONS>,
- dt DATETIME <CUSTOM_COL_OPTIONS>,
- ts TIMESTAMP <CUSTOM_COL_OPTIONS>,
--- a/storage/rocksdb/mysql-test/storage_engine/type_enum_indexes.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/type_enum_indexes.rdiff
--- /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
--- a/storage/rocksdb/mysql-test/storage_engine/type_fixed_indexes.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/type_fixed_indexes.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_fixed_indexes.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_fixed_indexes.reject	2017-06-22 15:09:58.611665194 +0300
-@@ -77,33 +77,21 @@
- n2 NUMERIC(65,4) <CUSTOM_COL_OPTIONS>,
- UNIQUE INDEX n1_n2 (n1,n2)
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	n1_n2	1	n1	#	#	NULL	NULL	#	#		
-t1	0	n1_n2	2	n2	#	#	NULL	NULL	#	#		
-INSERT INTO t1 (d1,d2,n1,n2) VALUES
-(10.22,60.12345,123456,14.3456),
-(10.0,60.12345,123456,14),
-(11.14,15,123456,13),
-(100,100,1,2),
-(0,0,0,0),
-(4540424564.23,3343303441.0,12,13),
-(15,17,23,100000);
-Warnings:
-Warning	1264	Out of range value for column 'd1' at row 6
-EXPLAIN SELECT DISTINCT n1+n2 FROM t1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	n1_n2	#	#	#	#
-SELECT DISTINCT n1+n2 FROM t1;
-n1+n2
-0.0000
-100023.0000
-123469.0000
-123470.0000
-123470.3456
-25.0000
-3.0000
-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 (d1 DECIMAL(10,2) /*!*/ /*Custom column options*/,
-+d2 DECIMAL(60,10) /*!*/ /*Custom column options*/,
-+n1 NUMERIC /*!*/ /*Custom indexed column options*/,
-+n2 NUMERIC(65,4) /*!*/ /*Custom indexed column options*/,
-+UNIQUE INDEX n1_n2 (n1,n2)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Fixed point 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 (d1 DECIMAL(10,2) <CUSTOM_COL_OPTIONS>,
- d2 DECIMAL(60,10) <CUSTOM_COL_OPTIONS>,
- n1 NUMERIC <CUSTOM_COL_OPTIONS>,
--- a/storage/rocksdb/mysql-test/storage_engine/type_float_indexes.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/type_float_indexes.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_float_indexes.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_float_indexes.reject	2017-06-22 15:11:12.543664729 +0300
-@@ -58,9 +58,11 @@
- 4644
- ALTER TABLE t1 DROP PRIMARY KEY;
- ALTER TABLE t1 ADD UNIQUE KEY(d);
-+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)
- EXPLAIN SELECT d FROM t1 WHERE r > 0 and d > 0 ORDER BY d;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	d	#	#	#	#
-+#	#	#	#	#	NULL	#	#	#	#
- SELECT d FROM t1 WHERE r > 0 and d > 0 ORDER BY d;
- d
- 1.2345
-@@ -73,51 +75,42 @@
- dp DOUBLE PRECISION (64,10) <CUSTOM_COL_OPTIONS>,
- UNIQUE KEY r_dp (r,dp)
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	r_dp	1	r	#	#	NULL	NULL	#	#		
-t1	0	r_dp	2	dp	#	#	NULL	NULL	#	#		
-INSERT INTO t1 (f,r,d,dp) VALUES
-(1.2345,1422.22,1.2345,1234567.89),
-(0,0,0,0),
-(-1,-1,-1,-1),
-(17.5843,4953453454.44,29229114.0,1111111.23),
-(4644,1422.22,466664.999,0.5);
-EXPLAIN SELECT r, dp FROM t1 WHERE r > 0 or dp > 0;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	r_dp	#	#	#	#
-SELECT r, dp FROM t1 WHERE r > 0 or dp > 0;
-r	dp
-1422.220	0.5000000000
-1422.220	1234567.8900000000
-4953453454.440	1111111.2300000000
-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 (f FLOAT /*!*/ /*Custom column options*/,
-+r REAL(20,3) /*!*/ /*Custom indexed column options*/,
-+d DOUBLE /*!*/ /*Custom column options*/,
-+dp DOUBLE PRECISION (64,10) /*!*/ /*Custom indexed column options*/,
-+UNIQUE KEY r_dp (r,dp)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Float point 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 (f FLOAT <CUSTOM_COL_OPTIONS>,
- r REAL(20,3) <CUSTOM_COL_OPTIONS>,
- d DOUBLE <CUSTOM_COL_OPTIONS>,
- dp DOUBLE PRECISION (64,10) <CUSTOM_COL_OPTIONS>,
- UNIQUE KEY(d)
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	d	1	d	#	#	NULL	NULL	#	#		
-INSERT INTO t1 (f,r,d,dp) VALUES
-(1.2345,1422.22,1.2345,1234567.89),
-(0,0,0,0),
-(-1,-1,-1,-1),
-(17.5843,4953453454.44,29229114.0,1111111.23),
-(4644,1422.22,466664.999,0.5);
-EXPLAIN SELECT DISTINCT d FROM t1 ORDER BY d;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	d	#	#	#	#
-SELECT DISTINCT d FROM t1 ORDER BY d;
-d
--1
-0
-1.2345
-466664.999
-29229114
-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 (f FLOAT /*!*/ /*Custom column options*/,
-+r REAL(20,3) /*!*/ /*Custom column options*/,
-+d DOUBLE /*!*/ /*Custom indexed column options*/,
-+dp DOUBLE PRECISION (64,10) /*!*/ /*Custom column options*/,
-+UNIQUE KEY(d)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Float point types or unique 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 (f FLOAT <CUSTOM_COL_OPTIONS>,
- r REAL(20,3) <CUSTOM_COL_OPTIONS>,
- d DOUBLE <CUSTOM_COL_OPTIONS>,
--- a/storage/rocksdb/mysql-test/storage_engine/type_int_indexes.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/type_int_indexes.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_int_indexes.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_int_indexes.reject	2017-06-22 15:12:14.199664342 +0300
-@@ -96,38 +96,19 @@
- b BIGINT <CUSTOM_COL_OPTIONS>,
- UNIQUE KEY b_t (b,t)
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-INSERT INTO t1 (i,t,s,m,b) VALUES (1,2,3,4,5),(1000,100,10000,1000000,1000000000000000000),(5,100,10000,1000000,100000000000000000),(2,3,4,5,6),(3,4,5,6,7),(101,102,103,104,105),(10001,103,10002,10003,10004),(10,11,12,13,14),(11,12,13,14,15),(12,13,14,15,16);
-SELECT b+t FROM t1 WHERE (b,t) IN ( SELECT b, t FROM t1 WHERE i>1 ) ORDER BY b+t;
-b+t
-9
-11
-25
-27
-29
-207
-10107
-100000000000000100
-1000000000000000100
-SELECT b+t FROM t1 FORCE INDEX (b_t) WHERE (b,t) IN ( SELECT b, t FROM t1 WHERE i>1 ) ORDER BY b+t;
-b+t
-9
-11
-25
-27
-29
-207
-10107
-100000000000000100
-1000000000000000100
-SELECT b+t FROM t1 IGNORE INDEX (b_t) WHERE (b,t) IN ( SELECT b, t FROM t1 WHERE i>1 ) ORDER BY b+t;
-b+t
-9
-11
-25
-27
-29
-207
-10107
-100000000000000100
-1000000000000000100
-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 (i INT /*!*/ /*Custom column options*/,
-+t TINYINT /*!*/ /*Custom indexed column options*/,
-+s SMALLINT /*!*/ /*Custom column options*/,
-+m MEDIUMINT /*!*/ /*Custom column options*/,
-+b BIGINT /*!*/ /*Custom indexed column options*/,
-+UNIQUE KEY b_t (b,t)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# INT 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).
-+# -------------------------------------------
--- a/storage/rocksdb/mysql-test/storage_engine/type_set_indexes.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/type_set_indexes.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_set_indexes.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_set_indexes.reject	2017-06-22 15:19:48.679661485 +0300
-@@ -108,30 +108,17 @@
- c SET('01','22','23','33','34','39','40','44','50','63','64') <CUSTOM_COL_OPTIONS>,
- UNIQUE INDEX b_a (b,a)
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	b_a	1	b	#	#	NULL	NULL	#	#		
-t1	0	b_a	2	a	#	#	NULL	NULL	#	#		
-INSERT INTO t1 (a,b,c) VALUES
-('','test2,test3','01,34,44,23'),
-('',5,2),
-('N.America,Asia','test4,test2',''),
-('Africa,Europe,Asia','test2,test3','01'),
-('Antarctica','test3','34,44'),
-('Asia','test5','50'),
-('Europe,S.America','test1,','39');
-Warnings:
-Warning	1265	Data truncated for column 'b' at row 7
-EXPLAIN SELECT DISTINCT a, b FROM t1 ORDER BY b DESC, a;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	#	b_a	#	#	#	#
-SELECT DISTINCT a, b FROM t1 ORDER BY b DESC, a;
-a	b
-	test1,test3
-	test2,test3
-Africa,Europe,Asia	test2,test3
-Antarctica	test3
-Asia	test5
-N.America,Asia	test2,test4
-S.America,Europe	test1
-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 SET('N.America','S.America','Africa','Antarctica','Australia','Europe','Asia') /*!*/ /*Custom indexed column options*/,
-+b SET('test1','test2','test3','test4','test5') /*!*/ /*Custom indexed column options*/,
-+c SET('01','22','23','33','34','39','40','44','50','63','64') /*!*/ /*Custom column options*/,
-+UNIQUE INDEX b_a (b,a)
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# SET 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).
-+# -------------------------------------------
--- a/storage/rocksdb/mysql-test/storage_engine/type_text_indexes.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/type_text_indexes.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_text_indexes.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_text_indexes.reject	2017-06-22 15:20:42.963661144 +0300
-@@ -65,50 +65,21 @@
- l LONGTEXT <CUSTOM_COL_OPTIONS>,
- UNIQUE INDEX l_tt (l(256),tt(64))
- ) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-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	l_tt	1	l	#	#	256	NULL	#	#		
-t1	0	l_tt	2	tt	#	#	64	NULL	#	#		
-INSERT INTO t1 (t,tt,m,l) VALUES
-('','','',''),
-('a','b','c','d'),
-('b','d','c','b'),
-('test1','test2','test3','test4'),
-(REPEAT('a',128),REPEAT('b',128),REPEAT('c',128),REPEAT('d',128)),
-('abc','def','ghi','jkl'),
-('test2','test3','test4','test5'),
-('test3','test4','test5','test6'),
-(REPEAT('b',128),REPEAT('f',128),REPEAT('e',128),REPEAT('d',128)),
-(REPEAT('c',128),REPEAT('b',128),REPEAT('c',128),REPEAT('e',128));
-EXPLAIN SELECT SUBSTRING(tt,64), SUBSTRING(l,256) FROM t1 WHERE tt!=l AND l NOT IN ('test1') ORDER BY tt, l DESC;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	l_tt	#	#	#	#	#
-SELECT SUBSTRING(tt,64), SUBSTRING(l,256) FROM t1 WHERE tt!=l AND l NOT IN ('test1') ORDER BY tt, l DESC;
-SUBSTRING(tt,64)	SUBSTRING(l,256)
-	
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	
-	
-	
-fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff	
-	
-	
-	
-EXPLAIN SELECT SUBSTRING(tt,64), SUBSTRING(l,256) FROM t1 FORCE INDEX (l_t) WHERE tt!=l AND l NOT IN ('test1') ORDER BY tt, l DESC;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-#	#	#	#	l_tt	l_tt	#	#	#	#
-SELECT SUBSTRING(tt,64), SUBSTRING(l,256) FROM t1 FORCE INDEX (l_t) WHERE tt!=l AND l NOT IN ('test1') ORDER BY tt, l DESC;
-SUBSTRING(tt,64)	SUBSTRING(l,256)
-	
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	
-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	
-	
-	
-fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff	
-	
-	
-	
-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 (t TEXT /*!*/ /*Custom column options*/,
-+tt TINYTEXT /*!*/ /*Custom indexed column options*/,
-+m MEDIUMTEXT /*!*/ /*Custom column options*/,
-+l LONGTEXT /*!*/ /*Custom indexed column options*/,
-+UNIQUE INDEX l_tt (l(256),tt(64))
-+) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# TEXT 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 (t TEXT <CUSTOM_COL_OPTIONS>,
- tt TINYTEXT <CUSTOM_COL_OPTIONS>,
- m MEDIUMTEXT <CUSTOM_COL_OPTIONS>,
--- a/storage/rocksdb/mysql-test/storage_engine/update_with_keys.rdiff
+++ b/storage/rocksdb/mysql-test/storage_engine/update_with_keys.rdiff
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/update_with_keys.result	2017-06-22 00:33:46.423995639 +0300
-+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/update_with_keys.reject	2017-06-22 15:21:52.275660708 +0300
-@@ -17,54 +17,27 @@
- 8	
- DROP TABLE t1;
- CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, UNIQUE INDEX(a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(0,'f'),(100,'a');
-UPDATE t1 SET a=a+200;
-UPDATE t1 SET a=0 WHERE a > 250;
-UPDATE t1 SET a=205 WHERE a=200;
-ERROR 23000: Duplicate entry '205' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-UPDATE t1 SET a=12345 ORDER BY a, b LIMIT 1;
-SELECT a,b FROM t1;
-a	b
-12345	a
-200	f
-201	a
-202	b
-203	c
-204	d
-205	e
-UPDATE t1 SET a=80 WHERE a IN (202,203);
-ERROR 23000: Duplicate entry '80' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-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 INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/, UNIQUE INDEX(a)) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# Unique 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 <INT_COLUMN>, b <CHAR_COLUMN>, UNIQUE INDEX(a,b)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
-INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(100,'a'),(6,'f');
-UPDATE t1 SET a=6 WHERE a=3;
-UPDATE t1 SET a=100 WHERE a=1;
-ERROR 23000: Duplicate entry '100-a' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-UPDATE t1 SET a=4, b='d' WHERE b='f';
-ERROR 23000: Duplicate entry '4-d' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-UPDATE t1 SET a=a+1;
-SELECT a,b FROM t1;
-a	b
-101	a
-2	a
-3	b
-5	d
-6	e
-7	c
-7	f
-UPDATE t1 SET b='z';
-ERROR 23000: Duplicate entry '7-z' for key 'a'
-# Statement ended with one of expected results (ER_DUP_ENTRY,ER_DUP_KEY). 
-# If you got a difference in error message, just add it to rdiff file
-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 INT(11) /*!*/ /*Custom column options*/, b CHAR(8) /*!*/ /*Custom column options*/, UNIQUE INDEX(a,b)) ENGINE=RocksDB /*!*/ /*Custom table options*/ ]
-+# The statement|command finished with ER_UNKNOWN_ERROR.
-+# 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 <INT_COLUMN> PRIMARY KEY, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
- INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c'),(4,'d'),(5,'e'),(0,'f'),(100,'a');
- UPDATE t1 SET a=a+200;