[Commits] Rev 3480: Merge MariaDB 10.0-base -> 10.0 in http://bazaar.launchpad.net/~maria-captains/maria/10.0

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Tue Nov 20 15:22:54 EET 2012


At http://bazaar.launchpad.net/~maria-captains/maria/10.0

------------------------------------------------------------
revno: 3480 [merge]
revision-id: knielsen at knielsen-hq.org-20121120132251-fzd2iju4hn8ttxhw
parent: timour at askmonty.org-20121115105450-zkiva73utg8pg49j
parent: knielsen at knielsen-hq.org-20121120132026-gcg2ht23pzm8tnd0
committer: knielsen at knielsen-hq.org
branch nick: mariadb-10.0
timestamp: Tue 2012-11-20 14:22:51 +0100
message:
  Merge MariaDB 10.0-base -> 10.0
modified:
  sql/log.h                      sp1f-log.h-20051222053446-ggv6hdi5fnxggnjemezvv7n2bcbkx45e
=== modified file 'sql/log.h'
--- a/sql/log.h	2012-09-30 23:30:44 +0000
+++ b/sql/log.h	2012-11-20 13:20:26 +0000
@@ -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:



More information about the commits mailing list