null+****@clear*****
null+****@clear*****
2011年 11月 27日 (日) 21:32:12 JST
Kouhei Sutou 2011-11-27 12:32:12 +0000 (Sun, 27 Nov 2011)
New Revision: 2008c7f076bf0ffe491b79b7ff4c058dd63cb68b
Log:
[mysql51] support inplace index change.
Removed files:
test/sql/include/have_inplace_index_change.inc
Modified files:
ha_mroonga.cc
ha_mroonga.h
mrn_mysql_compat.h
test/sql/suite/groonga_storage/t/fulltext_index_recreate.test
test/sql/suite/groonga_storage/t/fulltext_multiple_column_index_recreate.test
test/sql/suite/groonga_storage/t/multiple_column_index_recreate.test
test/sql/suite/groonga_wrapper/t/fulltext_index_recreate.test
test/sql/suite/groonga_wrapper/t/fulltext_multiple_column_index_recreate.test
Modified: ha_mroonga.cc (+0 -2)
===================================================================
--- ha_mroonga.cc 2011-11-27 12:18:49 +0000 (1f20a47)
+++ ha_mroonga.cc 2011-11-27 12:32:12 +0000 (2d00083)
@@ -890,7 +890,6 @@ static int mrn_set_key_buf(grn_ctx *ctx, Field *field,
static uint mrn_alter_table_flags(uint flags) {
uint ret_flags = 0;
-#ifdef MRN_HANDLER_HAVE_HA_INPLACE_INDEX_CHANGE
ret_flags |=
HA_INPLACE_ADD_INDEX_NO_READ_WRITE |
HA_INPLACE_DROP_INDEX_NO_READ_WRITE |
@@ -904,7 +903,6 @@ static uint mrn_alter_table_flags(uint flags) {
HA_INPLACE_DROP_UNIQUE_INDEX_NO_WRITE |
HA_INPLACE_ADD_PK_INDEX_NO_WRITE |
HA_INPLACE_DROP_PK_INDEX_NO_WRITE;
-#endif
return ret_flags;
}
Modified: ha_mroonga.h (+0 -4)
===================================================================
--- ha_mroonga.h 2011-11-27 12:18:49 +0000 (c506763)
+++ ha_mroonga.h 2011-11-27 12:32:12 +0000 (5c8b7af)
@@ -63,10 +63,6 @@ extern "C" {
# define MRN_HANDLER_HAVE_MULTI_RANGE_READ 1
#endif
-#if MYSQL_VERSION_ID >= 50512
-# define MRN_HANDLER_HAVE_HA_INPLACE_INDEX_CHANGE
-#endif
-
#ifndef MRN_MARIADB_P
# define MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP
#endif
Modified: mrn_mysql_compat.h (+16 -0)
===================================================================
--- mrn_mysql_compat.h 2011-11-27 12:18:49 +0000 (ba7e0b8)
+++ mrn_mysql_compat.h 2011-11-27 12:32:12 +0000 (a5b386f)
@@ -24,6 +24,22 @@
# define my_free(PTR, FLAG) my_free(PTR)
#endif
+#ifndef HA_INPLACE_ADD_INDEX_NO_READ_WRITE
+# define HA_INPLACE_ADD_INDEX_NO_READ_WRITE HA_ONLINE_ADD_INDEX_NO_WRITES
+# define HA_INPLACE_DROP_INDEX_NO_READ_WRITE HA_ONLINE_DROP_INDEX_NO_WRITES
+# define HA_INPLACE_ADD_UNIQUE_INDEX_NO_READ_WRITE HA_ONLINE_ADD_UNIQUE_INDEX_NO_WRITES
+# define HA_INPLACE_DROP_UNIQUE_INDEX_NO_READ_WRITE HA_ONLINE_DROP_UNIQUE_INDEX_NO_WRITES
+# define HA_INPLACE_ADD_PK_INDEX_NO_READ_WRITE HA_ONLINE_ADD_PK_INDEX_NO_WRITES
+# define HA_INPLACE_DROP_PK_INDEX_NO_READ_WRITE HA_ONLINE_DROP_PK_INDEX_NO_WRITES
+
+# define HA_INPLACE_ADD_INDEX_NO_WRITE HA_ONLINE_ADD_INDEX
+# define HA_INPLACE_DROP_INDEX_NO_WRITE HA_ONLINE_DROP_INDEX
+# define HA_INPLACE_ADD_UNIQUE_INDEX_NO_WRITE HA_ONLINE_ADD_UNIQUE_INDEX
+# define HA_INPLACE_DROP_UNIQUE_INDEX_NO_WRITE HA_ONLINE_DROP_UNIQUE_INDEX
+# define HA_INPLACE_ADD_PK_INDEX_NO_WRITE HA_ONLINE_ADD_PK_INDEX
+# define HA_INPLACE_DROP_PK_INDEX_NO_WRITE HA_ONLINE_DROP_PK_INDEX
+#endif
+
#if MYSQL_VERSION_ID < 50600
typedef Item COND;
#endif
Deleted: test/sql/include/have_inplace_index_change.inc (+0 -7) 100644
===================================================================
--- test/sql/include/have_inplace_index_change.inc 2011-11-27 12:18:49 +0000 (e68cbc7)
+++ /dev/null
@@ -1,7 +0,0 @@
---disable_query_log
-let $inplace_index_change = `SELECT @@global.version >= '5.5'`;
---enable_query_log
-if (!$inplace_index_change)
-{
- skip Inplace index change is availavle in version 5.5 or later;
-}
Modified: test/sql/suite/groonga_storage/t/fulltext_index_recreate.test (+0 -1)
===================================================================
--- test/sql/suite/groonga_storage/t/fulltext_index_recreate.test 2011-11-27 12:18:49 +0000 (5762332)
+++ test/sql/suite/groonga_storage/t/fulltext_index_recreate.test 2011-11-27 12:32:12 +0000 (35623f6)
@@ -14,7 +14,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---source include/have_inplace_index_change.inc
--source include/have_groonga.inc
--disable_warnings
Modified: test/sql/suite/groonga_storage/t/fulltext_multiple_column_index_recreate.test (+0 -1)
===================================================================
--- test/sql/suite/groonga_storage/t/fulltext_multiple_column_index_recreate.test 2011-11-27 12:18:49 +0000 (cd7832e)
+++ test/sql/suite/groonga_storage/t/fulltext_multiple_column_index_recreate.test 2011-11-27 12:32:12 +0000 (53b87f6)
@@ -14,7 +14,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---source include/have_inplace_index_change.inc
--source include/have_groonga.inc
--disable_warnings
Modified: test/sql/suite/groonga_storage/t/multiple_column_index_recreate.test (+0 -1)
===================================================================
--- test/sql/suite/groonga_storage/t/multiple_column_index_recreate.test 2011-11-27 12:18:49 +0000 (c4f1bf4)
+++ test/sql/suite/groonga_storage/t/multiple_column_index_recreate.test 2011-11-27 12:32:12 +0000 (b789bf2)
@@ -14,7 +14,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---source include/have_inplace_index_change.inc
--source include/have_groonga.inc
--disable_warnings
Modified: test/sql/suite/groonga_wrapper/t/fulltext_index_recreate.test (+0 -1)
===================================================================
--- test/sql/suite/groonga_wrapper/t/fulltext_index_recreate.test 2011-11-27 12:18:49 +0000 (c8c4f47)
+++ test/sql/suite/groonga_wrapper/t/fulltext_index_recreate.test 2011-11-27 12:32:12 +0000 (ff0d4fd)
@@ -14,7 +14,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---source include/have_inplace_index_change.inc
--source include/have_groonga.inc
--disable_warnings
Modified: test/sql/suite/groonga_wrapper/t/fulltext_multiple_column_index_recreate.test (+0 -1)
===================================================================
--- test/sql/suite/groonga_wrapper/t/fulltext_multiple_column_index_recreate.test 2011-11-27 12:18:49 +0000 (50d7782)
+++ test/sql/suite/groonga_wrapper/t/fulltext_multiple_column_index_recreate.test 2011-11-27 12:32:12 +0000 (96301cf)
@@ -14,7 +14,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---source include/have_inplace_index_change.inc
--source include/have_groonga.inc
--disable_warnings