diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:54:49 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:54:49 -0600 |
| commit | ba0cd51eb19f1f8868901d4b2327e1c8f4745c19 (patch) | |
| tree | 3b7d7d44c9a9850c900bf0c7499f62818e36ed84 /configure.in | |
| parent | db55af7c4073926e0b1b8ece0f50b4842a6a6d22 (diff) | |
| parent | adb1d7a32787e1e5c40a739b9f2e990e67ba946f (diff) | |
| download | mariadb-git-ba0cd51eb19f1f8868901d4b2327e1c8f4745c19.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
configure.in:
Auto merged
scripts/mysql_config.sh:
Auto merged
libmysql/libmysql.c:
Manual merge
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index b67f060ff30..0878f0331e4 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 5.0.50) +AM_INIT_AUTOMAKE(mysql, 5.0.52) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10 @@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=50 +NDB_VERSION_BUILD=52 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? |