diff options
author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:29:04 +0200 |
---|---|---|
committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:29:04 +0200 |
commit | 5139bf6c8f2cde4b598aa0e822f126936346f914 (patch) | |
tree | b38d061771d52ab55fe9d428e45627d4c08d5f63 /sql/sql_signal.cc | |
parent | bd75361929caadac565d471d7e374060ff93794d (diff) | |
parent | 8977575cff0ed295692e866b1cd543bdf49c0a20 (diff) | |
download | mariadb-git-5139bf6c8f2cde4b598aa0e822f126936346f914.tar.gz |
Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.
Diffstat (limited to 'sql/sql_signal.cc')
0 files changed, 0 insertions, 0 deletions