Commit 14b614e1 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1 


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BUILD/FINISH.sh:
  Auto merged
BUILD/compile-dist:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/ndb/src/cw/cpcd/Process.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
parents 383c19a0 848611b5

BUILD/FINISH.sh

+0 −6
Original line number Diff line number Diff line
@@ -2,12 +2,6 @@ cflags="$c_warnings $extra_flags" 
cxxflags="$cxx_warnings $base_cxxflags $extra_flags"

extra_configs="$extra_configs $local_infile_configs"

configure="./configure $base_configs $extra_configs"

for arg

do

  # Escape special characters so they don't confuse eval

  configure="$configure "`echo "$arg" | \

  		sed -e 's,\([^a-zA-Z0-9_.=-]\),\\\\\1,g'`

done



commands="\

$make -k distclean || true

BUILD/compile-dist

+5 −0
Original line number Diff line number Diff line
@@ -18,12 +18,17 @@ autoconf 
# Default to gcc for CC and CXX

if test -z "$CXX" ; then

  export CXX=gcc

  # Set some required compile options

  if test -z "$CXXFLAGS" ; then

    export CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"

  fi

fi



if test -z "$CC" ; then

  export CC=gcc

fi





# Use ccache, if available

if ccache -V > /dev/null 2>&1

then

BitKeeper/etc/logging_ok

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ jcole@sarvik.tfr.cafe.ee 
jcole@tetra.spaceapes.com

jimw@mysql.com

joerg@mysql.com

joerg@trift-lap.fambruehe

jon@gigan.

jonas@mysql.com

joreland@bk-internal.mysql.com
@@ -180,6 +181,7 @@ mwagner@cash.mwagner.org 
mwagner@evoq.mwagner.org

mwagner@here.mwagner.org

mwagner@mysql.com

mwagner@ultrafly.mysql.com

mwagner@work.mysql.com

mydev@mysql.com

mysql@home.(none)
@@ -227,6 +229,7 @@ ram@ram-book.(none) 
ram@ram.(none)

ramil@mysql.com

ranger@regul.home.lan

rburnett@bk-internal.mysql.com

rburnett@build.mysql.com

reggie@bob.(none)

reggie@mdk10.(none)

client/client_priv.h

+3 −3
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ enum options_client 
  OPT_COMPATIBLE, OPT_RECONNECT, OPT_DELIMITER, OPT_SECURE_AUTH,

  OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_CREATE_OPTIONS,

  OPT_START_POSITION, OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME,

  OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY

  OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT,

#ifdef HAVE_NDBCLUSTER_DB

  ,OPT_NDBCLUSTER,OPT_NDB_CONNECTSTRING

  OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,

#endif

  ,OPT_IGNORE_TABLE

  OPT_IGNORE_TABLE

};

client/mysql.cc

+17 −1
Original line number Diff line number Diff line
@@ -710,9 +710,15 @@ static void usage(int version) 
  const char* readline= "readline";

#endif



#ifdef HAVE_READLINE

  printf("%s  Ver %s Distrib %s, for %s (%s) using %s %s\n",

	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,

         readline, rl_library_version);

#else

  printf("%s  Ver %s Distrib %s, for %s (%s)", my_progname, VER,

	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);

#endif



  if (version)

    return;

  printf("\
@@ -956,7 +962,8 @@ static int read_lines(bool execute_commands) 
    }

    else

    {

      char *prompt= (char*) (glob_buffer.is_empty() ? construct_prompt() :

      char *prompt= (char*) (ml_comment ? "   /*> " :

                             glob_buffer.is_empty() ?  construct_prompt() :

			     !in_string ? "    -> " :

			     in_string == '\'' ?

			     "    '> " : (in_string == '`' ?
@@ -1093,6 +1100,7 @@ static bool add_line(String &buffer,char *line,char *in_string, 
  uchar inchar;

  char buff[80], *pos, *out;

  COMMANDS *com;

  bool need_space= 0;



  if (!line[0] && buffer.is_empty())

    return 0;
@@ -1201,6 +1209,7 @@ static bool add_line(String &buffer,char *line,char *in_string, 
    {

      pos++;

      *ml_comment= 0;

      need_space= 1;

    }      

    else

    {						// Add found char to buffer
@@ -1210,9 +1219,16 @@ static bool add_line(String &buffer,char *line,char *in_string, 
	       (inchar == '\'' || inchar == '"' || inchar == '`'))

	*in_string= (char) inchar;

      if (!*ml_comment)

      {

        if (need_space && !my_isspace(charset_info, (char)inchar))

        {

          *out++= ' ';

          need_space= 0;

        }

	*out++= (char) inchar;

      }

    }

  }

  if (out != line || !buffer.is_empty())

  {

    *out++='\n';