[Commits] Rev 2900: automerge in http://bazaar.launchpad.net/~maria-captains/maria/5.2

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Thu Jan 27 16:56:06 EET 2011


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

------------------------------------------------------------
revno: 2900 [merge]
revision-id: knielsen at knielsen-hq.org-20110127145600-md8oyg1590d45a4t
parent: knielsen at knielsen-hq.org-20110126143503-x191rl75ufr3xo81
parent: knielsen at knielsen-hq.org-20110127143239-dix4fo664odiqvua
committer: knielsen at knielsen-hq.org
branch nick: work-5.2-rpl
timestamp: Thu 2011-01-27 15:56:00 +0100
message:
  automerge
modified:
  sql/log.cc                     sp1f-log.cc-19700101030959-r3hdfovek4kl6nd64ovoaknmirota6bq
=== modified file 'sql/log.cc'
--- a/sql/log.cc	2011-01-26 14:35:03 +0000
+++ b/sql/log.cc	2011-01-27 14:56:00 +0000
@@ -6659,8 +6659,8 @@ mysql_bin_log_commit_pos(THD *thd, ulong
   }
   else
   {
-    *out_pos= NULL;
     *out_file= NULL;
+    *out_pos= 0;
   }
 }
 #endif /* INNODB_COMPATIBILITY_HOOKS */



More information about the commits mailing list