Commit dc6188e9 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

component/mariadb: version up MariaDB 10.2.7.

parent fca60f90
...@@ -90,6 +90,7 @@ configure-options = ...@@ -90,6 +90,7 @@ configure-options =
patch-options = -p1 patch-options = -p1
patches = patches =
${:_profile_base_location_}/mroonga_boolean.patch#29f85fc98e85d39b31e53b1e1683d288 ${:_profile_base_location_}/mroonga_boolean.patch#29f85fc98e85d39b31e53b1e1683d288
${:_profile_base_location_}/mroonga-7.04-mariadb-10.2.7.patch#719de0ad6dc07d059a172ad61b0dcc85
pre-build = pre-build =
sed -i -e "s,${mariadb:location}/include,$(pwd)/fake_mariadb_source/include,g" Makefile */Makefile sed -i -e "s,${mariadb:location}/include,$(pwd)/fake_mariadb_source/include,g" Makefile */Makefile
environment = environment =
......
[mariadb] [mariadb]
url = https://downloads.mariadb.com/MariaDB/mariadb-10.2.6/source/mariadb-10.2.6.tar.gz url = https://downloads.mariadb.org/f/mariadb-10.2.7/source/mariadb-10.2.7.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
md5sum = 3d454cdadbd3208e1c9c23e5338a62b0 md5sum = 81727986035c5835e0fbfdf99af71428
stable-patches = stable-patches =
configure-options += configure-options +=
-DPLUGIN_DAEMON_EXAMPLE=NO -DPLUGIN_DAEMON_EXAMPLE=NO
......
--- mroonga-7.04/mrn_table.cpp.orig 2017-07-13 07:38:04.408603138 +0200
+++ mroonga-7.04/mrn_table.cpp 2017-07-13 07:50:40.439937224 +0200
@@ -202,7 +202,11 @@
const TABLE *table, partition_element **part_elem,
partition_element **sub_elem)
{
+#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100207
+ char tmp_name[FN_LEN + 1];
+#else
char tmp_name[FN_LEN];
+#endif
partition_info *part_info = table->part_info;
partition_element *tmp_part_elem = NULL, *tmp_sub_elem = NULL;
bool tmp_flg = FALSE, tmp_find_flg = FALSE;
@@ -224,9 +228,16 @@
List_iterator<partition_element> sub_it((*part_elem)->subpartitions);
while ((*sub_elem = sub_it++))
{
+#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100207
+ if (create_subpartition_name(tmp_name, sizeof(tmp_name), table->s->path.str,
+ (*part_elem)->partition_name, (*sub_elem)->partition_name,
+ NORMAL_PART_NAME))
+ DBUG_VOID_RETURN;
+#else
create_subpartition_name(tmp_name, table->s->path.str,
(*part_elem)->partition_name, (*sub_elem)->partition_name,
NORMAL_PART_NAME);
+#endif
DBUG_PRINT("info", ("mroonga tmp_name=%s", tmp_name));
if (table_name && !memcmp(table_name, tmp_name, table_name_length + 1))
DBUG_VOID_RETURN;
@@ -243,8 +254,14 @@
}
}
} else {
+#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100207
+ if (create_partition_name(tmp_name, sizeof(tmp_name), table->s->path.str,
+ (*part_elem)->partition_name, NORMAL_PART_NAME, TRUE))
+ DBUG_VOID_RETURN;
+#else
create_partition_name(tmp_name, table->s->path.str,
(*part_elem)->partition_name, NORMAL_PART_NAME, TRUE);
+#endif
DBUG_PRINT("info", ("mroonga tmp_name=%s", tmp_name));
if (table_name && !memcmp(table_name, tmp_name, table_name_length + 1))
DBUG_VOID_RETURN;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment