diff options
| author | unknown <lenz@mysql.com> | 2005-01-14 19:15:55 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-01-14 19:15:55 +0100 |
| commit | 1d190526278de76b80e8f56b7073c0c385e75597 (patch) | |
| tree | c45ced673feb5cb2370e0bd11258c88d28cc47ea | |
| parent | 95a9acabeaf5f8d318e3d1710e1efc5eeada0f7a (diff) | |
| parent | 973800f387515669ccda63539155f25bda9715ec (diff) | |
| download | mariadb-git-1d190526278de76b80e8f56b7073c0c385e75597.tar.gz | |
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ndb/src/common/util/version.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 45ca009123e..9f89c635e7f 100644 --- a/configure.in +++ b/configure.in @@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0 # ndb version NDB_VERSION_MAJOR=4 NDB_VERSION_MINOR=1 -NDB_VERSION_BUILD=9 +NDB_VERSION_BUILD=10 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? diff --git a/ndb/src/common/util/version.c b/ndb/src/common/util/version.c index 9bc3488b078..8cc6de0fc24 100644 --- a/ndb/src/common/util/version.c +++ b/ndb/src/common/util/version.c @@ -90,6 +90,7 @@ void ndbSetOwnVersion() {} #ifndef TEST_VERSION struct NdbUpGradeCompatible ndbCompatibleTable_full[] = { + { 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 }, { 0, 0, UG_Null } |