Commit a24d4aa0 authored by unknown's avatar unknown
Browse files

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
parents 2a9b7256 fe652465

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -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]]*-.*$||"`