diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-13 07:21:21 +0400 |
| commit | 29acdcd5427e13bc3aefbbeee17b42bfe23dea84 (patch) | |
| tree | f8f5365594c3b43e01891b7017f47fa6b934c646 /sql/sql_partition.h | |
| parent | e33bda183e80ff63a984ed2a938467950b23a3fd (diff) | |
| parent | daec0004502a1f8c2ff7d46de92a61b5c4da1d6c (diff) | |
| download | mariadb-git-MDEV-9804.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804
Conflicts:
VERSION
debian/mariadb-backup-10.2.files
debian/mariadb-backup-10.2.install
debian/mariadb-backup-10.3.files
mysql-test/unstable-tests
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 3009d201bcd..b0dede7487e 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -280,12 +280,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_key_field_ptr(KEY *key_info, const uchar *new_buf, const uchar *old_buf); |