summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2010-11-16 10:05:19 +0100
committerJon Olav Hauglid <jon.hauglid@oracle.com>2010-11-16 10:05:19 +0100
commit2ef19bdcc420d090d0bed822a884eef40cd347a9 (patch)
tree7bb909d13afe24120327ea8c3d6aedfc42610685 /extra
parent294f3865cd5ca119dbc516e814a1594e2f8c1886 (diff)
parentb4b3c996af688aabb0001dbbf925084c46858fa7 (diff)
downloadmariadb-git-2ef19bdcc420d090d0bed822a884eef40cd347a9.tar.gz
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'extra')
0 files changed, 0 insertions, 0 deletions