diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-03-26 21:58:27 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-03-26 21:58:27 +0200 |
| commit | ded448d1d035d211c8146141546a08126bb728b6 (patch) | |
| tree | 0ebba8935193517995519651885a34e46ff53515 /storage/heap/ha_heap.h | |
| parent | 99316b51b6e78191eca303dc35ae5a204f8b5c4f (diff) | |
| download | mariadb-git-ded448d1d035d211c8146141546a08126bb728b6.tar.gz | |
MDEV-5905: Creating tmp. memory table kills the server
The reason was that a couple of variables that hold number of rows that was used to calculate buffers was uint and caused an overflow.
Fixed by changing variables that could hold number of rows from uint to ulong and also added a cast for this test.
include/heap.h:
Reorder to get better alignment. Changed variables that could hold number of rows from uint to ulong
mysql-test/suite/heap/heap.result:
Added test case
mysql-test/suite/heap/heap.test:
Added test case
mysql-test/suite/plugins/t/server_audit.test:
Added sleep as we want to have disconnect logged before we try a new connect
storage/heap/ha_heap.cc:
Changed variables that could hold number of rows from uint to ulong
Limit number of rows to 4G (as most of the variables that holds rows are ulong anyway)
reset records_changed when key_stat_version is changed to not cause increments for every row changed
storage/heap/ha_heap.h:
changed records_changed to ulong as this can get big
storage/heap/hp_create.c:
Changed variables that could hold number of rows from uint to ulong
Added cast (fixed the original bug)
storage/heap/hp_delete.c:
Changed variables that could hold number of rows from uint to ulong
storage/heap/hp_open.c:
Removed not needed cast
storage/heap/hp_write.c:
Changed variables that could hold number of rows from uint to ulong
support-files/compiler_warnings.supp:
Removed extra : from supression
Diffstat (limited to 'storage/heap/ha_heap.h')
| -rw-r--r-- | storage/heap/ha_heap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h index c5b8a09b216..9216e2e45b4 100644 --- a/storage/heap/ha_heap.h +++ b/storage/heap/ha_heap.h @@ -31,7 +31,7 @@ class ha_heap: public handler HP_SHARE *internal_share; key_map btree_keys; /* number of records changed since last statistics update */ - uint records_changed; + ulong records_changed; uint key_stat_version; my_bool internal_table; public: |