diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-25 13:56:50 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-25 13:56:50 +0300 |
| commit | 24fc798fc7a993a60b3f8dbfc56b37005dcdf530 (patch) | |
| tree | d33ce0a47fbf5181f9c5ebfeddb7830a2e9f7223 /sql/sql_parse.cc | |
| parent | 1d13320d9aebc198f0b84c8c1454f92978b3e89b (diff) | |
| parent | b367b03bcb3be508f0ffad37e9aa78f62c680252 (diff) | |
| download | mariadb-git-24fc798fc7a993a60b3f8dbfc56b37005dcdf530.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
mysql-test/collections/default.experimental
Diffstat (limited to 'sql/sql_parse.cc')
0 files changed, 0 insertions, 0 deletions