diff options
author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-21 16:28:29 +0200 |
---|---|---|
committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-21 16:28:29 +0200 |
commit | a776e5f3d297f45d63f48ad919ccd46307cddb30 (patch) | |
tree | 195abab8c3dce14713c36ff78f001dcb2cd8143f /mysql-test/r/kill.result | |
parent | 89e43c84943da707d72f168c48b86c41f8a05aff (diff) | |
parent | 346b73015af68dcbf9446a91425882278bd78cda (diff) | |
download | mariadb-git-a776e5f3d297f45d63f48ad919ccd46307cddb30.tar.gz |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'mysql-test/r/kill.result')
0 files changed, 0 insertions, 0 deletions