diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-08-12 20:56:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-08-12 20:56:35 +0200 |
| commit | 62b658a4050ae67643fce7a6206559ce05c6fc09 (patch) | |
| tree | d0b33d58118d95b461e3b03de31e110f14bd1e5a /sql/key.cc | |
| parent | 23b4ccde8b9a68e924de31dca26c21e2f36eef47 (diff) | |
| download | mariadb-git-62b658a4050ae67643fce7a6206559ce05c6fc09.tar.gz | |
MDEV-4786 merge 10.0-monty -> 10.0
remove half-applied "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
Diffstat (limited to 'sql/key.cc')
| -rw-r--r-- | sql/key.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/key.cc b/sql/key.cc index 97388f43ebc..edc3e6c0057 100644 --- a/sql/key.cc +++ b/sql/key.cc @@ -347,8 +347,8 @@ bool key_cmp_if_same(TABLE *table,const uchar *key,uint idx,uint key_length) @param prefix_key The field is used as a prefix key. */ -void field_unpack(String *to, Field *field, const uchar *rec, uint max_length, - bool prefix_key) +static void field_unpack(String *to, Field *field, const uchar *rec, + uint max_length, bool prefix_key) { String tmp; DBUG_ENTER("field_unpack"); |