Commit 88131b2f authored by unknown's avatar unknown
Browse files

Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/jan/mysql-4.1
parents d8735905 d7dd19aa

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"

include/config-win.h

+5 −0
Original line number Diff line number Diff line
@@ -150,6 +150,11 @@ typedef uint rf_SetTimer; 
#define HAVE_NAMED_PIPE			/* We can only create pipes on NT */

#endif



/* ERROR is defined in wingdi.h */

#ifdef ERROR

#undef ERROR

#endif 



/* We need to close files to break connections on shutdown */

#ifndef SIGNAL_WITH_VIO_CLOSE

#define SIGNAL_WITH_VIO_CLOSE

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)

libmysqld/lib_sql.cc

+5 −5
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, 
  THD *thd=(THD *) mysql->thd;

  NET *net= &mysql->net;



  if (thd->data)

  {

    free_rows(thd->data);

    thd->data= 0;

  }

  /* Check that we are calling the client functions in right order */

  if (mysql->status != MYSQL_STATUS_READY)

  {
@@ -217,11 +222,6 @@ static int emb_stmt_execute(MYSQL_STMT *stmt) 
  THD *thd= (THD*)stmt->mysql->thd;

  thd->client_param_count= stmt->param_count;

  thd->client_params= stmt->params;

  if (thd->data)

  {

    free_rows(thd->data);

    thd->data= 0;

  }

  if (emb_advanced_command(stmt->mysql, COM_EXECUTE,0,0,

			   (const char*)&stmt->stmt_id,sizeof(stmt->stmt_id),

			   1) ||