diff options
| author | unknown <lars@black.(none)> | 2006-11-15 13:17:43 +0100 |
|---|---|---|
| committer | unknown <lars@black.(none)> | 2006-11-15 13:17:43 +0100 |
| commit | a24d4aa025effc34c75e529f05f2f0df76b4f06a (patch) | |
| tree | e2387b687b6ff9957408d71667f5ab18b63cc7c1 /configure.in | |
| parent | 2a9b72568b010a5c2e1865cd93f9782780837874 (diff) | |
| parent | fe65246581e37e4bc245e3fc6b5de86959a990fe (diff) | |
| download | mariadb-git-a24d4aa025effc34c75e529f05f2f0df76b4f06a.tar.gz | |
Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
Auto merged
client/mysql.cc:
Auto merged
sql/log.cc:
Auto merged
configure.in:
Manual merge, main clone 5.0->5.1
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 004a901b4d4..b858f62927a 100644 --- a/configure.in +++ b/configure.in @@ -15,7 +15,6 @@ DOT_FRM_VERSION=6 # See the libtool docs for information on how to do shared lib versions. SHARED_LIB_MAJOR_VERSION=15 SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 - # 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]]*-.*$||"` |