diff options
author | Kristofer Pettersson <kristofer.pettersson@oracle.com> | 2011-03-11 15:19:42 +0100 |
---|---|---|
committer | Kristofer Pettersson <kristofer.pettersson@oracle.com> | 2011-03-11 15:19:42 +0100 |
commit | 27de68274027fdb25096acdbbfbc1bb123f0e79a (patch) | |
tree | fe286fefb07ccf16ab958ea2350d41b542ef45d4 /sql/sql_base.cc | |
parent | ef38c3a13f027662e03d80091924590b11ba2567 (diff) | |
parent | feeac7d1a4a804a69009d7b21c9e46c8758d0daa (diff) | |
download | mariadb-git-27de68274027fdb25096acdbbfbc1bb123f0e79a.tar.gz |
Null merge 5.1 to 5.5.
Diffstat (limited to 'sql/sql_base.cc')
0 files changed, 0 insertions, 0 deletions