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 | 5ef2bdea81a68a5440235bb5c841fff5dcc2b2c7 (patch) | |
| tree | faf6e2793eae5ff3a0ec48cebf47e8045db0a6ff /sql/handler.h | |
| parent | e94c1ab135e035dea4c2db9508d2d635b70bcf80 (diff) | |
| parent | 721ec081901b661b9338a47b3144c6c41829165a (diff) | |
| download | mariadb-git-5ef2bdea81a68a5440235bb5c841fff5dcc2b2c7.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/handler.h')
0 files changed, 0 insertions, 0 deletions