summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-02-15 15:37:38 +0100
committerunknown <knielsen@knielsen-hq.org>2012-02-15 15:37:38 +0100
commit4917073305801822e1a6afbebcf6fc177a6a3d63 (patch)
tree266a7623c3a80abbcefa7d944a71419889578ab1 /VERSION
parent47a54a2e087a7c1fc861bcbc114c14987f492cfe (diff)
parent452a59e09c9ae415d46b5900efd567a9fcb61267 (diff)
downloadmariadb-git-4917073305801822e1a6afbebcf6fc177a6a3d63.tar.gz
Merge XtraDB from Percona-Server-5.5.20-24.1 into MariaDB 5.5.
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index d05c93f6e73..508f021f35d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=21
+MYSQL_VERSION_PATCH=20
MYSQL_VERSION_EXTRA=