Commit ff25b925 authored by kent@mysql.com/kent-amd64.(none)'s avatar kent@mysql.com/kent-amd64.(none)
Browse files

configure.in: 

  Corrected calculation of version id, incorrect last two digits if < 10
  Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
  RPM spec file
  Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
  Added clear doc how the different version variables differ
SocketServer.cpp:
  Corrected typo in debug error message
parent 0c98586b

configure.in

+13 −3
Original line number Diff line number Diff line
@@ -26,9 +26,19 @@ 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]]*-.*$||"`

MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"`

MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION. | sed -e 's/[[^0-9.]]//g; s/\./  /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'`

# We take some made up examples

#

#  VERSION                  5.1.40sp1-alpha     5.0.34a

#  MYSQL_NO_DASH_VERSION    5.1.40sp1           5.0.34a

#  MYSQL_NUMERIC_VERSION    5.1.40              5.0.34

#  MYSQL_BASE_VERSION       5.1                 5.0

#  MYSQL_VERSION_ID         50140               50034

#

MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"`

MYSQL_NUMERIC_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]]*$||"`

MYSQL_BASE_VERSION=`echo $MYSQL_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"`

MYSQL_VERSION_ID=`echo $MYSQL_NUMERIC_VERSION | \

    awk -F. '{printf "%d%0.2d%0.2d", $1, $2, $3}'`



# The port should be constant for a LONG time

MYSQL_TCP_PORT_DEFAULT=3306

ndb/src/common/util/SocketServer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ SocketServer::setup(SocketServer::Service * service, 
  const int on = 1;

  if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, 

		 (const char*)&on, sizeof(on)) == -1) {

    DBUG_PRINT("error",("getsockopt() - %d - %s",

    DBUG_PRINT("error",("setsockopt() - %d - %s",

			errno, strerror(errno)));

    NDB_CLOSE_SOCKET(sock);

    DBUG_RETURN(false);