diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-23 16:19:37 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-23 16:19:37 +0100 |
| commit | 52051882002c1b88a427d50fb343a9ed3614ffe0 (patch) | |
| tree | 6da97d315d36c2a8a557a3227612c3aaf9aabee1 /mysys/ma_dyncol.c | |
| parent | e3f08e7e0bbc56cd401bb1031827571498c15904 (diff) | |
| download | mariadb-git-52051882002c1b88a427d50fb343a9ed3614ffe0.tar.gz | |
cleanup:
* remove unused mysql_option
* don't allocate 5GB of memory in the mtr tests
* restore the behavior in dynamic_column_offset_byte(), put the ifdef correctly
* prefer __attribute__((unused)) to #ifdef
* prefer UNINIT_VAR to LINT_INIT
* make most Warning_info users blissfully unaware of the postponed initialization
* use my_offsetof instead of offsetof where the compiler thinks the latter is incorrect
Diffstat (limited to 'mysys/ma_dyncol.c')
| -rw-r--r-- | mysys/ma_dyncol.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index ec94c17dfdb..8a224f1c5e8 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -342,10 +342,8 @@ static my_bool type_and_offset_store_num(uchar *place, size_t offset_size, int3store(place, val); break; case 4: -#if SIZEOF_SIZE_T > 4 if (offset >= 0x1fffffff) /* all 1 value is reserved */ return TRUE; -#endif int4store(place, val); break; default: @@ -488,8 +486,8 @@ static size_t dynamic_column_offset_bytes_named(size_t data_length) return 4; #if SIZEOF_SIZE_T > 4 if (data_length < 0xfffffffffull) /* all 1 value is reserved */ - return 5; #endif + return 5; return MAX_OFFSET_LENGTH_NM + 1; /* For an error generation */ } |