diff options
| author | Monty <monty@mariadb.org> | 2015-07-09 14:47:32 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-07-09 14:47:32 +0300 |
| commit | 9bb8b74e99adced1ccb38ced24a96cf2d1040f39 (patch) | |
| tree | c58f67cd054fa8829ca11d275f86db7691031eb2 /storage/myisam | |
| parent | a6c801438717b815288acb72513f5e42fe736b7b (diff) | |
| parent | 77803703431d79f5dcc2b23b3f878dfdbaf01c2b (diff) | |
| download | mariadb-git-9bb8b74e99adced1ccb38ced24a96cf2d1040f39.tar.gz | |
Merge branch '10.1' of github.com:MariaDB/server into 10.1
Conflicts:
sql/item_subselect.cc
Fixed also typo in comment
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/myisamdef.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h index 8ca052af4ac..8b48119390a 100644 --- a/storage/myisam/myisamdef.h +++ b/storage/myisam/myisamdef.h @@ -394,7 +394,7 @@ struct st_myisam_info #define PACK_TYPE_SELECTED 1 /* Bits in field->pack_type */ #define PACK_TYPE_SPACE_FIELDS 2 #define PACK_TYPE_ZERO_FILL 4 -#define MI_FOUND_WRONG_KEY 32738 /* Impossible value from ha_key_cmp */ +#define MI_FOUND_WRONG_KEY 0x7FFFFFFF /* Impossible value from ha_key_cmp */ #define MI_MAX_KEY_BLOCK_SIZE (MI_MAX_KEY_BLOCK_LENGTH/MI_MIN_KEY_BLOCK_LENGTH) #define MI_BLOCK_SIZE(key_length,data_pointer,key_pointer,block_size) (((((key_length)+(data_pointer)+(key_pointer))*4+(key_pointer)+2)/(block_size)+1)*(block_size)) |