[Commits] d257f92: Re-commit in git: Post-fixes after UNIQUE index support was

Sergei Petrunia psergey at askmonty.org
Sat Jul 12 00:28:22 EEST 2014


revision-id: d257f92bbe35474764cf91ac8bfaf643542034cf
parent(s): 64a271f72755c5007ee0659716fc151b1a9f65d4
committer: Sergei Petrunia
branch nick: webscalesql-5.6
timestamp: 2014-07-12 01:28:22 +0400
message:

Re-commit in git: Post-fixes after UNIQUE index support was
enabled without uniqueness enforcement.
- Fix compile warning
- Fix the rocksdb.test/result

-----------------------

 mysql-test/r/rocksdb.result   |    2 +-
 mysql-test/t/rocksdb.test     |    3 ++-
 storage/rocksdb/ha_rocksdb.cc |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mysql-test/r/rocksdb.result b/mysql-test/r/rocksdb.result
index 553c43a..d12326e 100644
--- a/mysql-test/r/rocksdb.result
+++ b/mysql-test/r/rocksdb.result
@@ -686,8 +686,8 @@ DROP TABLE t33;
 #
 # MDEV-4081: RocksDB throws error 122 on an attempt to create a table with unique index
 #
+#  Unique indexes can be created, but uniqueness won't be enforced
 create table t33 (pk int primary key, u int, unique index(u)) engine=RocksDB;
-ERROR HY000: Got error 187 'Unique indexes are not supported' from ROCKSDB
 #
 # MDEV-4077: RocksDB: Wrong result (duplicate row) on select with range 
 #
diff --git a/mysql-test/t/rocksdb.test b/mysql-test/t/rocksdb.test
index 52be54a..f4e158e 100644
--- a/mysql-test/t/rocksdb.test
+++ b/mysql-test/t/rocksdb.test
@@ -610,7 +610,8 @@ DROP TABLE t33;
 --echo #
 --echo # MDEV-4081: RocksDB throws error 122 on an attempt to create a table with unique index
 --echo #
---error ER_GET_ERRMSG
+#--error ER_GET_ERRMSG
+--echo #  Unique indexes can be created, but uniqueness won't be enforced
 create table t33 (pk int primary key, u int, unique index(u)) engine=RocksDB;
 
 
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
index f475db3..bfb6ef5 100644
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/storage/rocksdb/ha_rocksdb.cc
@@ -1052,7 +1052,7 @@ int ha_rocksdb::create(const char *name, TABLE *table_arg,
   /*
     We only support auto_increment at start of the PRIMARY KEY.
   */ 
-  Field *field;
+  //Field *field;
   //if ((field= table_arg->next_number_field))
   /* TODO mdcallag: disable this for now to let UNIQUE indexes kind of work
   if ((field= table_arg->found_next_number_field))


More information about the commits mailing list