summaryrefslogtreecommitdiff
path: root/libmysqld/libmysqld.c
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2015-09-18 18:39:08 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2015-09-18 18:39:08 +0200
commit9c6405fefaf7311b31591ab445660e8f34d64295 (patch)
tree87aa09ef6a2f9d33d2d19ef56d3e76e57114d361 /libmysqld/libmysqld.c
parentf4fe138321092c8dcd02caf22bdbad9698ee6829 (diff)
parent79140b03839a6b46a92736bd2ce03cefd43a5058 (diff)
downloadmariadb-git-9c6405fefaf7311b31591ab445660e8f34d64295.tar.gz
Commit resolved conflicts
Diffstat (limited to 'libmysqld/libmysqld.c')
0 files changed, 0 insertions, 0 deletions