List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:October 15 2010 2:51pm
Subject:bzr commit into mysql-5.1-innodb branch (vasil.dimov:3635)
View as plain text  
#At file:///usr/local/devel/bzrroot/server/mysql-5.1-innodb/ based on revid:vasil.dimov@stripped

 3635 Vasil Dimov	2010-10-15
      Remove leftover conflict marker
      
      It was added in jimmy.yang@stripped

    modified:
      storage/innodb_plugin/ChangeLog
=== modified file 'storage/innodb_plugin/ChangeLog'
--- a/storage/innodb_plugin/ChangeLog	revid:vasil.dimov@stripped
+++ b/storage/innodb_plugin/ChangeLog	revid:vasil.dimov@stripped
@@ -54,7 +54,6 @@
 	* handler/ha_innodb.cc:
 	Fix Bug#55382 Assignment with SELECT expressions takes unexpected
 	S locks in READ COMMITTED
->>>>>>> MERGE-SOURCE
 
 2010-07-27	The InnoDB Team
 


Attachment: [text/bzr-bundle] bzr/vasil.dimov@oracle.com-20101015145045-e2wxcioetpafpqhh.bundle
Thread
bzr commit into mysql-5.1-innodb branch (vasil.dimov:3635) vasil.dimov15 Oct