diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-09 02:03:35 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-09 02:03:35 +0400 |
| commit | ad43230e3bd5a419709a2559478be5cfb2cae3d2 (patch) | |
| tree | faf6e2793eae5ff3a0ec48cebf47e8045db0a6ff /sql/sql_load.cc | |
| parent | a8f15e2764dddecf3172d9a597df8b15e7e73f77 (diff) | |
| parent | 31a79ec3c6237df2bc42f93528e41374e44d1055 (diff) | |
| download | mariadb-git-ad43230e3bd5a419709a2559478be5cfb2cae3d2.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/grant.result
Text conflict in mysql-test/t/grant.test
Text conflict in mysys/mf_loadpath.c
Text conflict in sql/slave.cc
Text conflict in sql/sql_priv.h
Diffstat (limited to 'sql/sql_load.cc')
0 files changed, 0 insertions, 0 deletions