diff options
| author | unknown <sanja@montyprogram.com> | 2013-08-20 14:48:29 +0300 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-08-20 14:48:29 +0300 |
| commit | 35b2883643e337a8ec9c3cf7494363ae9889119c (patch) | |
| tree | eb2e7d833ed965b30f8b8485cfdac31abfea6c97 /mysys | |
| parent | dafa458262fb47a2c9534bcc36088b15e26307c2 (diff) | |
| parent | b59738a598569ace75be5e63b7ed6ca69afe6ebc (diff) | |
| download | mariadb-git-35b2883643e337a8ec9c3cf7494363ae9889119c.tar.gz | |
merge 5.5 -> 10.0-base
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/ma_dyncol.c | 3 | ||||
| -rw-r--r-- | mysys/waiting_threads.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index 71ceceaf162..2ab5f443233 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -1913,7 +1913,8 @@ static size_t get_length_interval(uchar *entry, uchar *entry_next, if (entry_next >= header_end) return (last_offset - offset); if (type_and_offset_read_num(&type_next, &offset_next, - entry_next + COLUMN_NUMBER_SIZE, offset_size)) + entry_next + COLUMN_NUMBER_SIZE, offset_size) || + (offset_next > last_offset)) return DYNCOL_OFFSET_ERROR; return (offset_next - offset); } diff --git a/mysys/waiting_threads.c b/mysys/waiting_threads.c index 56125f8951e..1fe6a0f9a1c 100644 --- a/mysys/waiting_threads.c +++ b/mysys/waiting_threads.c @@ -476,6 +476,7 @@ void wt_end() my_atomic_rwlock_destroy(&cycle_stats_lock); my_atomic_rwlock_destroy(&success_stats_lock); my_atomic_rwlock_destroy(&wait_stats_lock); + reshash.alloc.constructor= NULL; wt_init_done= 0; DBUG_VOID_RETURN; } |