diff options
author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-08 15:37:04 +0100 |
---|---|---|
committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-08 15:37:04 +0100 |
commit | ea3bb00d6a8690a8684f6bce696fefcbc65c5288 (patch) | |
tree | dde72d0109d3374c766eeea9cdecb5458d9c35fa /sql/sql_handler.h | |
parent | 0de0d997f0ec877c17fe55bd59d6f2098c021a7f (diff) | |
parent | 42e133e74e6f7e6adcf15afaa7bae1449c42ebbb (diff) | |
download | mariadb-git-ea3bb00d6a8690a8684f6bce696fefcbc65c5288.tar.gz |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'sql/sql_handler.h')
0 files changed, 0 insertions, 0 deletions