diff options
| author | monty@donna.mysql.com <> | 2000-08-15 20:09:37 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-08-15 20:09:37 +0300 |
| commit | ea013c2152301e459504451efdb17f4c9bb30877 (patch) | |
| tree | 5f72e7444fbc3c8d944a66b54b26550a04e4f0be /mysys/string.c | |
| parent | 807460bbceceec25bf97352bc5e232c3e766d70f (diff) | |
| download | mariadb-git-ea013c2152301e459504451efdb17f4c9bb30877.tar.gz | |
Fixed for Ia64 + delayed key creation + a lot of small bug fixes
Diffstat (limited to 'mysys/string.c')
| -rw-r--r-- | mysys/string.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/string.c b/mysys/string.c index f7e265a43e6..0696c72b922 100644 --- a/mysys/string.c +++ b/mysys/string.c @@ -33,7 +33,7 @@ my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str, if (!alloc_increment) alloc_increment=128; length=1; - if (init_str && (length=strlen(init_str)+1) < init_alloc) + if (init_str && (length= (uint) strlen(init_str)+1) < init_alloc) init_alloc=((length+alloc_increment-1)/alloc_increment)*alloc_increment; if (!init_alloc) init_alloc=alloc_increment; @@ -53,7 +53,7 @@ my_bool dynstr_set(DYNAMIC_STRING *str, const char *init_str) uint length; DBUG_ENTER("dynstr_set"); - if (init_str && (length=strlen(init_str)+1) > str->max_length) + if (init_str && (length= (uint) strlen(init_str)+1) > str->max_length) { str->max_length=((length+str->alloc_increment-1)/str->alloc_increment)* str->alloc_increment; |