diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-16 10:05:19 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-16 10:05:19 +0100 |
| commit | 0caa22b145db22b718434566720fb7dea715692c (patch) | |
| tree | 7bb909d13afe24120327ea8c3d6aedfc42610685 /mysql-test/r/sp-lock.result | |
| parent | a3d9a26d3b9ada36d7c57815614027c9fa798002 (diff) | |
| parent | d6d16303cd5e2ba623f51a115f12954fe4a0ce2c (diff) | |
| download | mariadb-git-0caa22b145db22b718434566720fb7dea715692c.tar.gz | |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'mysql-test/r/sp-lock.result')
0 files changed, 0 insertions, 0 deletions