Commit 4e7cb1ce authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
parents 7d4ad390 946c48ba

bdb/dist/configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ fi 
LIB@&t@OBJS=`echo "$LIB@&t@OBJS" |

	     sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'`

LTLIBOBJS=`echo "$LIB@&t@OBJS" |

	   sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`

	   sed "s,\.[[^.]]* ,$o ,g;s,\.[[^.]]*$,$o,"`

AC_SUBST(LTLIBOBJS)



# Initial output file list.

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

AM_INIT_AUTOMAKE(mysql, 4.1.4-beta)

AM_INIT_AUTOMAKE(mysql, 4.1.4-gamma)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -2823,7 +2823,7 @@ then 
      AC_CONFIG_FILES(bdb/Makefile)



      echo "CONFIGURING FOR BERKELEY DB" 

      bdb_conf_flags=

      bdb_conf_flags="--disable-shared"

      if test $with_debug = "yes"

      then

        bdb_conf_flags="$bdb_conf_flags --enable-debug --enable-diagnostic"

libmysqld/examples/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ DEFS = -DEMBEDDED_LIBRARY 
INCLUDES =	@MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \

		-I$(top_srcdir) -I$(top_srcdir)/client $(openssl_includes)

LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@

LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @bdb_libs_with_path@ @LIBDL@ $(CXXLDFLAGS)

LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)



mysqltest_LINK = $(CXXLINK)

myisammrg/myrg_open.c

+4 −8
Original line number Diff line number Diff line
@@ -32,20 +32,16 @@ 


MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking)

{

  int save_errno,errpos;

  uint files,i,dir_length,length,key_parts;

  int save_errno,errpos=0;

  uint files=0,i,dir_length,length,key_parts;

  ulonglong file_offset;

  char name_buff[FN_REFLEN*2],buff[FN_REFLEN],*end;

  MYRG_INFO *m_info;

  MYRG_INFO *m_info=0;

  File fd;

  IO_CACHE file;

  MI_INFO *isam;

  MI_INFO *isam=0;

  DBUG_ENTER("myrg_open");



  LINT_INIT(m_info);

  m_info=0;

  isam=0;

  errpos=files=0;

  bzero((char*) &file,sizeof(file));

  if ((fd=my_open(fn_format(name_buff,name,"",MYRG_NAME_EXT,4),

		  O_RDONLY | O_SHARE,MYF(0))) < 0)

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -1451,9 +1451,9 @@ then 
  then

    echo "Starting ndbcluster"

    ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1

    USE_NDBCLUSTER="--ndb-connectstring=\"host=localhost:$NDBCLUSTER_PORT\""

    USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"host=localhost:$NDBCLUSTER_PORT\""

  else

    USE_NDBCLUSTER="--ndb-connectstring=\"$USE_RUNNING_NDBCLUSTER\""

    USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"$USE_RUNNING_NDBCLUSTER\""

    echo "Using ndbcluster at $USE_NDBCLUSTER"

  fi

  fi