null+****@clear*****
null+****@clear*****
2011年 6月 11日 (土) 10:52:54 JST
Kouhei Sutou 2011-06-11 01:52:54 +0000 (Sat, 11 Jun 2011)
New Revision: 9a8a73d2a1a974896a68dd0fc1ffdc6d2d483b55
Log:
make re-support on MySQL 5.1.
Should we support both MySQL 5.1 and 5.5? It seems too costful...
Modified files:
ha_mroonga.cc
Modified: ha_mroonga.cc (+10 -0)
===================================================================
--- ha_mroonga.cc 2011-06-11 01:15:13 +0000 (f7c8a3d)
+++ ha_mroonga.cc 2011-06-11 01:52:54 +0000 (2dac736)
@@ -1655,13 +1655,19 @@ int ha_mroonga::delete_table(const char *name)
#else
table_list.init_one_table(db_name, tbl_name, TL_WRITE);
#endif
+#if MYSQL_VERSION_ID >= 50500
mysql_mutex_lock(&LOCK_open);
+#endif
if (!(tmp_table_share = mrn_get_table_share(&table_list, &error)))
{
+#if MYSQL_VERSION_ID >= 50500
mysql_mutex_unlock(&LOCK_open);
+#endif
DBUG_RETURN(error);
}
+#if MYSQL_VERSION_ID >= 50500
mysql_mutex_unlock(&LOCK_open);
+#endif
/* This is previous version */
tmp_table_share->version--;
tmp_table.s = tmp_table_share;
@@ -1682,9 +1688,13 @@ int ha_mroonga::delete_table(const char *name)
}
mrn_free_share(tmp_share);
+#if MYSQL_VERSION_ID >= 50500
mysql_mutex_lock(&LOCK_open);
+#endif
mrn_free_table_share(tmp_table_share);
+#if MYSQL_VERSION_ID >= 50500
mysql_mutex_unlock(&LOCK_open);
+#endif
DBUG_RETURN(error);
}