diff options
author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-07 15:33:18 +0200 |
---|---|---|
committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-07 15:33:18 +0200 |
commit | 4bc7ff6993128b1389410b5dff5b65723515c1ac (patch) | |
tree | 21ff904f301455dec07c933e0f5e4958244614e2 /sql/sp.h | |
parent | 60d558d89d35664faf48ddc3eb4c95d0c39014f7 (diff) | |
parent | e486d21dfc0f731a8e109c211845f6172175c612 (diff) | |
download | mariadb-git-4bc7ff6993128b1389410b5dff5b65723515c1ac.tar.gz |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'sql/sp.h')
0 files changed, 0 insertions, 0 deletions