bk commit into 5.1 tree (df:1.2404)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.1 repository of df. When df does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-25 09:18:10+01:00, df@stripped +5 -0
  merge fix
  MERGE: 1.1810.2371.64

  BUILD/SETUP.sh@stripped, 2007-01-25 09:18:08+01:00, df@stripped +1 -3
    merge fix
    MERGE: 1.44.1.18

  configure.in@stripped, 2007-01-25 09:18:08+01:00, df@stripped +0 -0
    merge fix
    MERGE: 1.245.1.177

  sql/ha_ndbcluster.cc@stripped, 2007-01-25 09:04:50+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.175.1.123

  sql/mysqld.cc@stripped, 2007-01-25 09:04:50+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.439.1.151

  sql/sql_class.cc@stripped, 2007-01-25 09:04:50+01:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.223.1.34

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	df
# Host:	kahlann.erinye.com
# Root:	/home/df/mysql/build/mysql-5.1-build-work-25530/RESYNC

--- 1.421/configure.in	2007-01-23 14:52:46 +01:00
+++ 1.422/configure.in	2007-01-25 09:18:08 +01:00
@@ -2354,6 +2354,7 @@ readline_basedir=""
 readline_dir=""
 readline_h_ln_cmd=""
 readline_link=""
+want_to_use_readline="no"
 
 if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null
 then
@@ -2379,6 +2380,7 @@ then
     readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a"
     readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/readline readline"
     compile_readline=yes
+    want_to_use_readline="yes"
     AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)
 else
     # Use system readline library
@@ -2388,10 +2390,12 @@ else
     MYSQL_CHECK_NEW_RL_INTERFACE
     MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY
     AC_LANG_RESTORE
-    if [test "$mysql_cv_new_rl_interface" = "yes"]
+    if [test "$mysql_cv_new_rl_interface" = "yes"] && [test -d
"./cmd-line-utils/readline"]
     then
-        # Use the new readline interface
+        # Use the new readline interface, but only if the package includes a bundled
libreadline
+        # this way we avoid linking commercial source with GPL readline
         readline_link="-lreadline"
+        want_to_use_readline="yes"
     elif [test "$mysql_cv_libedit_interface" = "yes"]
     then
         # Use libedit
@@ -2402,6 +2406,15 @@ else
           versions of libedit or readline])
     fi
 fi
+
+# if there is no readline, but we want to build with readline, we fail
+if [test "$want_to_use_readline" = "yes"] && [test ! -d
"./cmd-line-utils/readline"]
+then
+    AC_MSG_ERROR([This commercially licensed MySQL source package can't
+          be built with libreadline. Please use --with-libedit to use
+          the bundled version of libedit instead.])
+fi
+
 #
 # if either readline or libedit is enabled - generate Makefile's for both
 # (to make sure both are included in 'make dist')

--- 1.66/BUILD/SETUP.sh	2007-01-07 18:21:39 +01:00
+++ 1.67/BUILD/SETUP.sh	2007-01-25 09:18:08 +01:00
@@ -139,8 +139,16 @@ fi
 #
 base_configs="--prefix=$prefix --enable-assembler "
 base_configs="$base_configs --with-extra-charsets=complex "
-base_configs="$base_configs --enable-thread-safe-client --with-readline "
+base_configs="$base_configs --enable-thread-safe-client "
 base_configs="$base_configs --with-big-tables"
+
+if test -d "$path/../cmd-line-utils/readline"
+then
+    base_configs="$base_configs --with-readline"
+elif test -d "$path/../cmd-line-utils/libedit"
+then
+    base_configs="$base_configs --with-libedit"
+fi
 
 static_link="--with-mysqld-ldflags=-all-static "
 static_link="$static_link --with-client-ldflags=-all-static"