At file:///home/psergey/chroot/saucy-x64/home/psergey/dev2/mysql-5.6-rocksdb-r2/
------------------------------------------------------------
revno: 4876
revision-id: psergey@askmonty.org-20140711162114-051drr4tocqpbx30
parent: psergey@askmonty.org-20140711161708-b50tdmlr60djrror
committer: Sergey Petrunya <psergey@askmonty.org>
branch nick: mysql-5.6-rocksdb-r2
timestamp: Fri 2014-07-11 20:21:14 +0400
message:
Post-fixes after UNIQUE index support was enabled without uniquenessenforcement.
- Fix compile warning
- Fix the rocksdb.test/result
=== modified file 'mysql-test/r/rocksdb.result'
--- a/mysql-test/r/rocksdb.result 2014-07-03 20:58:25 +0000
+++ b/mysql-test/r/rocksdb.result 2014-07-11 16:21:14 +0000
@@ -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
#
=== modified file 'mysql-test/t/rocksdb.test'
--- a/mysql-test/t/rocksdb.test 2014-07-03 20:58:25 +0000
+++ b/mysql-test/t/rocksdb.test 2014-07-11 16:21:14 +0000
@@ -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;
=== modified file 'storage/rocksdb/ha_rocksdb.cc'
--- a/storage/rocksdb/ha_rocksdb.cc 2014-07-09 23:46:24 +0000
+++ b/storage/rocksdb/ha_rocksdb.cc 2014-07-11 16:21:14 +0000
@@ -1051,7 +1051,7 @@ int ha_rocksdb::create(const char *name,
/*
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))
_______________________________________________
commits mailing list
commits@mariadb.org
https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits