mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.1' into 10.2

Browse source
This commit is contained in:
Sergei Golubchik 2016-03-23 22:36:46 +01:00
commit f67a2211ec
298 changed files with 4434 additions and 1471 deletions
Download patch file Download diff file Expand all files Collapse all files

8
storage/mroonga/mrn_table.cpp
View file

@ -278,7 +278,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
#define MRN_PARAM_STR(title_name, param_name) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info", ("mroonga "title_name" start")); \
DBUG_PRINT("info", ("mroonga " title_name " start")); \
if (!share->param_name) \
{ \
if ((share->param_name = mrn_get_string_between_quote( \
@ -290,7 +290,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info", ("mroonga "title_name"=%s", share->param_name)); \
DBUG_PRINT("info", ("mroonga " title_name "=%s", share->param_name)); \
} \
break; \
}
@ -298,7 +298,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
#define MRN_PARAM_STR_LIST(title_name, param_name, param_pos) \
if (!strncasecmp(tmp_ptr, title_name, title_length)) \
{ \
DBUG_PRINT("info", ("mroonga "title_name" start")); \
DBUG_PRINT("info", ("mroonga " title_name " start")); \
if (share->param_name && !share->param_name[param_pos]) \
{ \
if ((share->param_name[param_pos] = mrn_get_string_between_quote( \
@ -311,7 +311,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
MYF(0), tmp_ptr); \
goto error; \
} \
DBUG_PRINT("info", ("mroonga "title_name"[%d]=%s", param_pos, \
DBUG_PRINT("info", ("mroonga " title_name "[%d]=%s", param_pos, \
share->param_name[param_pos])); \
} \
break; \