diff options
| author | monty@mysql.com <> | 2004-10-22 18:44:51 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-22 18:44:51 +0300 |
| commit | 3afecef4df146c1a44f7f17f640f365e251c4438 (patch) | |
| tree | 6faefd7a2f197f4031ef94eb74fc71f8f2936185 /heap | |
| parent | 97b4a3415dd2f107c925496fa5c0c0cd96d5db3c (diff) | |
| download | mariadb-git-3afecef4df146c1a44f7f17f640f365e251c4438.tar.gz | |
Fix compiler warnings (detected by Intel's C++ compiler)
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/hp_hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/heap/hp_hash.c b/heap/hp_hash.c index 71eecc8bdf2..b54e76d79fe 100644 --- a/heap/hp_hash.c +++ b/heap/hp_hash.c @@ -585,7 +585,7 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key, char_length / seg->charset->mbmaxlen); set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */ if (char_length < seg->length) - seg->charset->cset->fill(seg->charset, key + char_length, + seg->charset->cset->fill(seg->charset, (char*) key + char_length, seg->length - char_length, ' '); } memcpy(key, rec + seg->start, (size_t) char_length); @@ -634,7 +634,7 @@ uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, char_length / seg->charset->mbmaxlen); set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */ if (char_length < seg->length) - seg->charset->cset->fill(seg->charset, key + char_length, + seg->charset->cset->fill(seg->charset, (char*) key + char_length, seg->length - char_length, ' '); } memcpy(key, old, (size_t) char_length); |