diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-11-20 14:22:51 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-11-20 14:22:51 +0100 |
| commit | 49b1d95e4c4072e1aa859aac9e5ee608dc5a84a7 (patch) | |
| tree | a7d6f0bf5bbbdd008afb52c0b1a2b995beda03a1 /sql | |
| parent | cd2feb659bacda664af7784f714474498eb99b3b (diff) | |
| parent | 6058b654f798d094a475a3306bd8ecd3b6e865a0 (diff) | |
| download | mariadb-git-49b1d95e4c4072e1aa859aac9e5ee608dc5a84a7.tar.gz | |
Merge MariaDB 10.0-base -> 10.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.h b/sql/log.h index 0e887b48462..3959411d83a 100644 --- a/sql/log.h +++ b/sql/log.h @@ -118,7 +118,7 @@ class TC_LOG_MMAP: public TC_LOG struct pending_cookies { uint count; uint pending_count; - ulong cookies[TC_LOG_PAGE_SIZE]; + ulong cookies[TC_LOG_PAGE_SIZE/sizeof(my_xid)]; }; private: |