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 | 2ef19bdcc420d090d0bed822a884eef40cd347a9 (patch) | |
tree | 7bb909d13afe24120327ea8c3d6aedfc42610685 /libmysqld | |
parent | 294f3865cd5ca119dbc516e814a1594e2f8c1886 (diff) | |
parent | b4b3c996af688aabb0001dbbf925084c46858fa7 (diff) | |
download | mariadb-git-2ef19bdcc420d090d0bed822a884eef40cd347a9.tar.gz |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'libmysqld')
0 files changed, 0 insertions, 0 deletions