diff options
| author | unknown <aivanov@mysql.com> | 2005-12-13 23:56:22 +0300 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2005-12-13 23:56:22 +0300 |
| commit | 2d35684e7fd42f7fe9d576de81546de0c6091b44 (patch) | |
| tree | 1b3162fc2ef923d6a9b4a39d73db835928084755 /configure.in | |
| parent | 4e4e347b785a452b6c8865c7b74910c778ae38b6 (diff) | |
| parent | 11b6afd3b3c7460ef5b9d058aa630e77a5140346 (diff) | |
| download | mariadb-git-2d35684e7fd42f7fe9d576de81546de0c6091b44.tar.gz | |
Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92
into mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss92
mysql-test/t/ndb_read_multi_range.test:
Auto merged
configure.in:
Merged
mysql-test/r/innodb.result:
Null merge
mysql-test/t/innodb.test:
Null merge
sql/ha_innodb.cc:
Null merge
storage/innobase/btr/btr0sea.c:
Null merge
storage/innobase/dict/dict0dict.c:
Null merge
storage/innobase/dict/dict0load.c:
Null merge
storage/innobase/include/buf0buf.h:
Null merge
storage/innobase/include/dict0dict.h:
Null merge
storage/innobase/include/dict0load.h:
Null merge
storage/innobase/include/os0file.h:
Null merge
storage/innobase/include/rem0cmp.h:
Null merge
storage/innobase/include/srv0srv.h:
Null merge
storage/innobase/rem/rem0cmp.c:
Null merge
storage/innobase/row/row0ins.c:
Null merge
storage/innobase/row/row0mysql.c:
Null merge
storage/innobase/srv/srv0srv.c:
Null merge
storage/innobase/srv/srv0start.c:
Null merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto-merge
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto-merge
support-files/mysql.spec.sh:
Auto-merge
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 6a1aa763bce..b5d9b3267c6 100644 --- a/configure.in +++ b/configure.in @@ -14,6 +14,12 @@ DOT_FRM_VERSION=6 # See the libtool docs for information on how to do shared lib versions. SHARED_LIB_VERSION=15:0:0 +# ndb version +NDB_VERSION_MAJOR=5 +NDB_VERSION_MINOR=0 +NDB_VERSION_BUILD=18 +NDB_VERSION_STATUS="" + # Set all version vars based on $VERSION. How do we do this more elegant ? # Remember that regexps needs to quote [ and ] since this is run through m4 MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"` |