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 | aee8fce23309b1e90061a38c3c2eacf8a0efeb16 (patch) | |
tree | dde72d0109d3374c766eeea9cdecb5458d9c35fa /sql/sql_handler.cc | |
parent | 355ff93fbc4f6314a75c35bb96425a34d13420d3 (diff) | |
parent | a7e2306ed2e88a2265e83514064c1e70a8df891c (diff) | |
download | mariadb-git-aee8fce23309b1e90061a38c3c2eacf8a0efeb16.tar.gz |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'sql/sql_handler.cc')
0 files changed, 0 insertions, 0 deletions