diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-27 14:42:12 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-27 14:42:12 +0400 |
| commit | 17325b8d6788cfd6f8ff158a6e7e11c7ab9f008e (patch) | |
| tree | ad1ade4c08ab71afbaee51c4b337e8f67e3df6bf /COPYING | |
| parent | b19c880522ebc4ba232373d48be67a49fa921286 (diff) | |
| parent | 54a006fa0f33147b61a309a28e9ee0e3742f829c (diff) | |
| download | mariadb-git-17325b8d6788cfd6f8ff158a6e7e11c7ab9f008e.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Null-merged patch for bug 53907.
Conflicts:
conflict sql/sql_parse.cc
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions