summaryrefslogtreecommitdiff
path: root/ndb/src/common/util
diff options
context:
space:
mode:
authorjonas@eel.(none) <>2005-08-18 14:07:31 +0200
committerjonas@eel.(none) <>2005-08-18 14:07:31 +0200
commit96f719818c1cc1c0402970e13cd4ea370fd0d7e5 (patch)
tree8d78347bfd9f5eefa96e3dd2f7a0233ef59c2b3b /ndb/src/common/util
parent6e84ca33d9b5fff45ac0d940d47606b4e3a455a0 (diff)
parent3b68047235d6a7bd8816672fdc7bad9a4de1bb18 (diff)
downloadmariadb-git-96f719818c1cc1c0402970e13cd4ea370fd0d7e5.tar.gz
Merge eel.(none):/home/jonas/src/mysql-4.1
into eel.(none):/home/jonas/src/mysql-4.1-push
Diffstat (limited to 'ndb/src/common/util')
-rw-r--r--ndb/src/common/util/version.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ndb/src/common/util/version.c b/ndb/src/common/util/version.c
index ba4bcf30516..51cf8082a62 100644
--- a/ndb/src/common/util/version.c
+++ b/ndb/src/common/util/version.c
@@ -92,7 +92,8 @@ void ndbSetOwnVersion() {}
#ifndef TEST_VERSION
struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
- { MAKE_VERSION(4,1,NDB_VERSION_BUILD), MAKE_VERSION(4,1,10), UG_Range },
+ { MAKE_VERSION(4,1,NDB_VERSION_BUILD), MAKE_VERSION(4,1,15), UG_Range },
+ { MAKE_VERSION(4,1,14), MAKE_VERSION(4,1,10), UG_Range },
{ MAKE_VERSION(4,1,10), MAKE_VERSION(4,1,9), UG_Exact },
{ MAKE_VERSION(4,1,9), MAKE_VERSION(4,1,8), UG_Exact },
{ MAKE_VERSION(3,5,2), MAKE_VERSION(3,5,1), UG_Exact },
@@ -100,6 +101,7 @@ struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
};
struct NdbUpGradeCompatible ndbCompatibleTable_upgrade[] = {
+ { MAKE_VERSION(4,1,15), MAKE_VERSION(4,1,14), UG_Exact },
{ MAKE_VERSION(3,5,4), MAKE_VERSION(3,5,3), UG_Exact },
{ 0, 0, UG_Null }
};