summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2014-08-19 21:35:14 +0300
committerMichael Widenius <monty@mariadb.org>2014-08-19 21:35:14 +0300
commitbd2117d154b9cc367b708932de5d6064a339462d (patch)
tree6c0fac6d84a3f88acb40ca9e410bd7724440af86 /VERSION
parentcfa1ce81bb7992c362958bb95f41325ce2109834 (diff)
parent5569132ffebba3fd2e37964543f658ed24d8caaf (diff)
downloadmariadb-git-bd2117d154b9cc367b708932de5d6064a339462d.tar.gz
Automatic merge from 5.5
Fixed 2 failing tests by replacing result files
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION1
1 files changed, 0 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index d0e11a358c5..8b9f91dd819 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,3 @@
MYSQL_VERSION_MAJOR=10
MYSQL_VERSION_MINOR=0
MYSQL_VERSION_PATCH=14
-MYSQL_VERSION_EXTRA=