Commit c4e9afa2 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/jonas/src/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
parents 217e7f22 87b7e20e

client/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ else 
  yassl_dummy_link_fix=

endif

#AUTOMAKE_OPTIONS =              nostdinc

INCLUDES =			-I$(top_srcdir)/include -I$(top_srcdir)/regex \

				$(openssl_includes) -I$(top_builddir)/include

INCLUDES =			-I$(top_builddir)/include -I$(top_srcdir)/include \

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

LIBS =				@CLIENT_LIBS@

LDADD=				@CLIENT_EXTRA_LDFLAGS@ \

                                $(top_builddir)/libmysql/libmysqlclient.la

client/mysqldump.c

+9 −0
Original line number Diff line number Diff line
@@ -2561,6 +2561,7 @@ static int do_show_master_status(MYSQL *mysql_con) 
    row = mysql_fetch_row(master);

    if (row && row[0] && row[1])

    {

      /* SHOW MASTER STATUS reports file and position */

      if (opt_comments)

        fprintf(md_result_file,

                "\n--\n-- Position to start replication or point-in-time "
@@ -2570,6 +2571,14 @@ static int do_show_master_status(MYSQL *mysql_con) 
              comment_prefix, row[0], row[1]); 

      check_io(md_result_file);

    }

    else if (!ignore_errors)

    {

      /* SHOW MASTER STATUS reports nothing and --force is not enabled */

      my_printf_error(0, "Error: Binlogging on server not active", 

		      MYF(0), mysql_error(mysql_con));

      mysql_free_result(master);

      return 1;

    }

    mysql_free_result(master);

  }

  return 0;

cmd-line-utils/libedit/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
ASRC=vi.c emacs.c common.c

AHDR=vi.h emacs.h common.h



INCLUDES =		-I$(top_srcdir)/include -I$(srcdir)/../.. -I..

INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \

			-I$(srcdir)/../.. -I..



noinst_LIBRARIES =	libedit.a

cmd-line-utils/readline/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.



# Last  -I$(top_srcdir) needed for RedHat!

INCLUDES =		-I$(top_srcdir)/include -I$(top_srcdir)

INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \

			-I$(top_srcdir)



noinst_LIBRARIES =	libreadline.a

dbug/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

# MA 02111-1307, USA



INCLUDES =              -I$(top_srcdir)/include

INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include

LDADD =                 libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a

pkglib_LIBRARIES =      libdbug.a

noinst_HEADERS =        dbug_long.h