diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-09 10:00:49 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-09 10:00:49 +0100 |
| commit | abf9d35213ba482a3927651ddb98baa47aeb34fd (patch) | |
| tree | 567bee47df18c21d5fbc09bbb4fee4e8f26df4d9 /storage/myisam | |
| parent | 50a796dcba2abe5f25c1e4cd8a69d7ea43343a8d (diff) | |
| parent | 40ae1b9b618fbbc3b494a896a9d074b74e414337 (diff) | |
| download | mariadb-git-abf9d35213ba482a3927651ddb98baa47aeb34fd.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mi_create.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c index d4cc31368dd..bdd932b86fe 100644 --- a/storage/myisam/mi_create.c +++ b/storage/myisam/mi_create.c @@ -1,5 +1,6 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates + Copyright (c) 2000, 2015, Oracle and/or its affiliates + Copyright (c) 2010, 2015, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -473,7 +474,6 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, key_del[i]=HA_OFFSET_ERROR; unique_key_parts=0; - offset=reclength-uniques*MI_UNIQUE_HASH_LENGTH; for (i=0, uniquedef=uniquedefs ; i < uniques ; i++ , uniquedef++) { uniquedef->key=keys+i; @@ -739,7 +739,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, #endif } /* Create extra keys for unique definitions */ - offset=reclength-uniques*MI_UNIQUE_HASH_LENGTH; + offset=real_reclength - uniques * MI_UNIQUE_HASH_LENGTH; bzero((char*) &tmp_keydef,sizeof(tmp_keydef)); bzero((char*) &tmp_keyseg,sizeof(tmp_keyseg)); for (i=0; i < uniques ; i++) |