diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-01-04 23:53:10 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-01-04 23:53:10 +0200 |
| commit | 43ddd3b89ffea24147332f95fb7c8929d2873e63 (patch) | |
| tree | 515404d81d907f5cc07418eda021020b55789214 /sql | |
| parent | d2f7348fdcb47a4fab6d3904143272f25535b5f0 (diff) | |
| parent | ce068186f698872e6d7c7f475ffa2bca664f070d (diff) | |
| download | mariadb-git-43ddd3b89ffea24147332f95fb7c8929d2873e63.tar.gz | |
Merge bug fixes from 5.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index 4b8efc45cb0..31e35999264 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -5192,8 +5192,8 @@ int TC_LOG_MMAP::open(const char *opt_name) pthread_mutex_init(&pg->lock, MY_MUTEX_INIT_FAST); pthread_cond_init (&pg->cond, 0); pg->start=(my_xid *)(data + i*tc_log_page_size); - pg->end=(my_xid *)(pg->start + tc_log_page_size); pg->size=pg->free=tc_log_page_size/sizeof(my_xid); + pg->end=pg->start + pg->size; } pages[0].size=pages[0].free= (tc_log_page_size-TC_LOG_HEADER_SIZE)/sizeof(my_xid); |