diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 16:52:06 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 16:52:06 +0400 |
| commit | 386929d3aee738cd0e3db335fb54e95bba8f9985 (patch) | |
| tree | dd79682febb582afa1309c3b04f172d140b20aa6 /mysql-test/r/alter_table-big.result | |
| parent | 0823afc8bf160e03ce722c5e3cef21024b63b99a (diff) | |
| parent | c2ebb0ac882feadedd0bbca71277fd2de66aa957 (diff) | |
| download | mariadb-git-386929d3aee738cd0e3db335fb54e95bba8f9985.tar.gz | |
Manual merge from the bugfix tree.
conflicts:
conflict sql/sql_parse.cc
Diffstat (limited to 'mysql-test/r/alter_table-big.result')
0 files changed, 0 insertions, 0 deletions