summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-09-09 00:38:15 +0300
committerMichael Widenius <monty@askmonty.org>2012-09-09 00:38:15 +0300
commit5161b3ddde41617cc623e54980f6f28f38e650a7 (patch)
tree8da35de47ecc339e7d3e7642c59bab2e4ef17546 /sql/sql_base.cc
parent22de18ddcb97640f8f90c1c88d1dcd795ba1070f (diff)
parent2fc4c75194c1c6cc432d847ed47ef73298ff4c7f (diff)
downloadmariadb-git-5161b3ddde41617cc623e54980f6f28f38e650a7.tar.gz
Automatic merge
Diffstat (limited to 'sql/sql_base.cc')
0 files changed, 0 insertions, 0 deletions