summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-10-04 01:03:55 +0300
committerMichael Widenius <monty@askmonty.org>2012-10-04 01:03:55 +0300
commit3734a364f287230e3861b6a4ca292534849d89dc (patch)
treed9e62a1bebeeaf57ea2970d2b2f884769ce04e8c /sql
parent620d14f8c3521f9ec7283b8690e0e16434739d33 (diff)
parentb722aebdf4cd73be88e2ae6768dce05276f52076 (diff)
downloadmariadb-git-3734a364f287230e3861b6a4ca292534849d89dc.tar.gz
Automatic merge
Diffstat (limited to 'sql')
0 files changed, 0 insertions, 0 deletions