diff options
author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-24 15:13:23 +0100 |
---|---|---|
committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-02-24 15:13:23 +0100 |
commit | 6781bc56d59974c50a4ef2c96b49d8e827e1a259 (patch) | |
tree | 594478f4b05c403185ebe67179c146e19f6ce481 /VERSION | |
parent | 7391a6356c504b2742e56bfc8cb3e5dd9193f05f (diff) | |
parent | 69b82937591f6e5cf30ec75d1ba7caf0cb69ead4 (diff) | |
download | mariadb-git-6781bc56d59974c50a4ef2c96b49d8e827e1a259.tar.gz |
merge from 5.5 main
Diffstat (limited to 'VERSION')
-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=10 +MYSQL_VERSION_PATCH=11 MYSQL_VERSION_EXTRA= |