summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-02-24 15:13:23 +0100
committerBjorn Munch <bjorn.munch@oracle.com>2011-02-24 15:13:23 +0100
commit6781bc56d59974c50a4ef2c96b49d8e827e1a259 (patch)
tree594478f4b05c403185ebe67179c146e19f6ce481 /VERSION
parent7391a6356c504b2742e56bfc8cb3e5dd9193f05f (diff)
parent69b82937591f6e5cf30ec75d1ba7caf0cb69ead4 (diff)
downloadmariadb-git-6781bc56d59974c50a4ef2c96b49d8e827e1a259.tar.gz
merge from 5.5 main
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 17335ff3fc5..ca1578a8642 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=10
+MYSQL_VERSION_PATCH=11
MYSQL_VERSION_EXTRA=