summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-05-31 11:46:30 +0300
committerMichael Widenius <monty@askmonty.org>2012-05-31 11:46:30 +0300
commit59b4ee145452f57be86f1a983186d18e712138ef (patch)
tree82790038a2aedf70d89730e89780df6705d7a586 /VERSION
parentaa81e025a88d13c5040bb3fe808d70fd6d1e560c (diff)
parentafedd72e225654225b20a91b072b012e4c57a9d4 (diff)
downloadmariadb-git-59b4ee145452f57be86f1a983186d18e712138ef.tar.gz
Merge with 5.5
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 94796f2c7ba..0f96ceb238d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=23
+MYSQL_VERSION_PATCH=24
MYSQL_VERSION_EXTRA=