diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-06 23:47:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-06 23:47:33 +0200 |
| commit | 89dc445a55156881318ca94ce042dbaf98e53e26 (patch) | |
| tree | 04da8a074a8ceac347cb21e0c6e2ee1d05a990c6 /sql/sql_partition.h | |
| parent | 4d2131354914f54f85abf0bb8cb4bdd42d817f73 (diff) | |
| parent | f305a7ce4bccbd56520d874e1d81a4f29bc17a96 (diff) | |
| download | mariadb-git-89dc445a55156881318ca94ce042dbaf98e53e26.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_partition.h')
| -rw-r--r-- | sql/sql_partition.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_partition.h b/sql/sql_partition.h index 5da132661c9..1b7735b5e96 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -274,12 +274,12 @@ bool partition_key_modified(TABLE *table, const MY_BITMAP *fields); #define partition_key_modified(X,Y) 0 #endif -void create_partition_name(char *out, const char *in1, - const char *in2, uint name_variant, - bool translate); -void create_subpartition_name(char *out, const char *in1, - const char *in2, const char *in3, - uint name_variant); +int __attribute__((warn_unused_result)) + create_partition_name(char *out, size_t outlen, const char *in1, const char + *in2, uint name_variant, bool translate); +int __attribute__((warn_unused_result)) + create_subpartition_name(char *out, size_t outlen, const char *in1, const + char *in2, const char *in3, uint name_variant); void set_field_ptr(Field **ptr, const uchar *new_buf, const uchar *old_buf); void set_key_field_ptr(KEY *key_info, const uchar *new_buf, |