[mysql/f17: 2/2] Merge branch 'f18' into f17

[Honza Horak]

commit d68331c7def066339074f67d084918b64098d561
Merge: d5521ba 7988555
Author: Honza Horák <hhorak at redhat.com>
Date:   Fri Apr 19 14:03:22 2013 +0200

    Merge branch 'f18' into f17

 .gitignore              |    1 +
 mysql-plugin-test.patch |   18 +++++++++---------
 mysql.spec              |    6 +++++-
 sources                 |    2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)
---
diff --cc .gitignore
index 84390da,1862b59..ee32730
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -/mysql-5.5.29-nodocs.tar.gz
  /mysql-5.5.30-nodocs.tar.gz
+ /mysql-5.5.31-nodocs.tar.gz