Skip to content

M
MariaDB
Commit f6d25562 authored by Vasil Dimov's avatar Vasil Dimov
Browse files
Options

Remove leftover conflict marker 

It was added in jimmy.yang@oracle.com-20100902004302-m5ax9qo0ne2msdfx
parent f65d3c24
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
storage/innodb_plugin/ChangeLog
View file @ f6d25562
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7