diff options
| author | Jorgen Loland <jorgen.loland@oracle.com> | 2011-06-10 10:55:46 +0200 |
|---|---|---|
| committer | Jorgen Loland <jorgen.loland@oracle.com> | 2011-06-10 10:55:46 +0200 |
| commit | a240df3336224832ce475bd2f37992a0d8c70af0 (patch) | |
| tree | feeca7af152a859d174ccf0b861c51af08d77526 | |
| parent | 92eab9957df974a5adabc61a3ff1dc4a0e6c6249 (diff) | |
| parent | 5dc0872d9d3d9f453213e68a8093cf7812184a8a (diff) | |
| download | mariadb-git-a240df3336224832ce475bd2f37992a0d8c70af0.tar.gz | |
local merge
| -rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=5 -MYSQL_VERSION_PATCH=14 +MYSQL_VERSION_PATCH=15 MYSQL_VERSION_EXTRA= |