summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-05-26 22:20:37 +0300
committerMichael Widenius <monty@askmonty.org>2010-05-26 22:20:37 +0300
commit2d43ff67ddab70e6fb89682e201cb788c845e71e (patch)
treefb2bfae7fb5bfbeccb2c0a3681cbd16e7044e8fc /include
parent4aa9d903c11554cc4887eeffe7f0592c52e8bc99 (diff)
downloadmariadb-git-2d43ff67ddab70e6fb89682e201cb788c845e71e.tar.gz
Resolve bzr conflicts
storage/pbxt/src/ha_pbxt.cc: LOCK_plugin is not locked anymore as part of plugin initialization
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions