diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-06 19:31:54 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-06 19:31:54 -0300 |
commit | 6652fc78b7b5e1093a0670c3271fec7d626bb222 (patch) | |
tree | 9f702de0fbdda2f2ce8c8af502bc934bceacd34a /sql | |
parent | 04dd8ed0eb5f06f670f6e455b06c1173988a8f11 (diff) | |
download | mariadb-git-6652fc78b7b5e1093a0670c3271fec7d626bb222.tar.gz |
Fix what is probably the result of a bad merge. No functional change.
Diffstat (limited to 'sql')
0 files changed, 0 insertions, 0 deletions