summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-03-04 22:25:34 +0100
committerSergei Golubchik <sergii@pisem.net>2014-03-04 22:25:34 +0100
commit75124c5d2b1cdd5356063fa2af6615424f4838da (patch)
treeec5819aca3c6b8712106ed322154c5f948bea0d3 /client
parenta692645145d42424fbcf535941d63def98736889 (diff)
downloadmariadb-git-75124c5d2b1cdd5356063fa2af6615424f4838da.tar.gz
xtradb, windows, aio: fix the bad merge
Diffstat (limited to 'client')
0 files changed, 0 insertions, 0 deletions