diff options
author | Michael Widenius <monty@mariadb.org> | 2014-08-19 21:35:14 +0300 |
---|---|---|
committer | Michael Widenius <monty@mariadb.org> | 2014-08-19 21:35:14 +0300 |
commit | bd2117d154b9cc367b708932de5d6064a339462d (patch) | |
tree | 6c0fac6d84a3f88acb40ca9e410bd7724440af86 /VERSION | |
parent | cfa1ce81bb7992c362958bb95f41325ce2109834 (diff) | |
parent | 5569132ffebba3fd2e37964543f658ed24d8caaf (diff) | |
download | mariadb-git-bd2117d154b9cc367b708932de5d6064a339462d.tar.gz |
Automatic merge from 5.5
Fixed 2 failing tests by replacing result files
Diffstat (limited to 'VERSION')
-rw-r--r-- | VERSION | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1,4 +1,3 @@ MYSQL_VERSION_MAJOR=10 MYSQL_VERSION_MINOR=0 MYSQL_VERSION_PATCH=14 -MYSQL_VERSION_EXTRA= |