Merge MariaDB 10.0-base -> 10.0

5226949d · unknown · b95e5e56 · 58a70a67 · 5226949d
Commit 5226949d authored Nov 20, 2012 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/log.h sql/log.h +1 -1

No files found.
--- 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: