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

Merge 


include/config-netware.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
netware/BUILD/compile-AUTOTOOLS:
  Auto merged
netware/Makefile.am:
  Auto merged
netware/my_manage.h:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
netware/BUILD/mwenv:
  Auto merged
netware/BUILD/nwbootstrap:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/os/os0thread.c:
  Auto merged
storage/myisam/mi_locking.c:
  Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
parents 0dbf883a 0d4cae38

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -1905,7 +1905,7 @@ EOF 
;



    print OUT "nonguarded\n" if $instance->{'nonguarded'};

    print OUT "old-log-format\n" if $instance->{'old_log_format'};

    print OUT "log-output=FILE\n" if $instance->{'old_log_format'};

    print OUT "\n";

  }

mysql-test/r/im_utils.result

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ skip-stack-trace VALUE 
skip-innodb	VALUE

skip-bdb	VALUE

skip-ndbcluster	VALUE

old-log-format	VALUE

log-output	VALUE

SHOW INSTANCE OPTIONS mysqld2;

option_name	value

instance_name	VALUE
@@ -42,7 +42,7 @@ skip-stack-trace VALUE 
skip-innodb	VALUE

skip-bdb	VALUE

skip-ndbcluster	VALUE

old-log-format	VALUE

log-output	VALUE

START INSTANCE mysqld2;

STOP INSTANCE mysqld2;

SHOW mysqld1 LOG FILES;

mysql-test/t/rpl_ndb_bank.test

+3 −3
Original line number Diff line number Diff line
@@ -10,14 +10,14 @@ 
# 5. check that the slave and master BANK databases are the same

#

 

# kill any trailing processes

--system killall lt-bankTransactionMaker lt-bankTimer lt-bankMakeGL || true



--source include/have_ndb.inc

--source include/have_ndb_extra.inc

--source include/have_binlog_format_row.inc

--source include/master-slave.inc



# kill any trailing processes

--system killall lt-bankTransactionMaker lt-bankTimer lt-bankMakeGL || true



--disable_warnings

# initialize master

--connection master

scripts/make_binary_distribution.sh

+10 −8
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ 
  extra/resolve_stack_dump$BS extra/mysql_waitpid$BS \

  storage/myisam/myisamchk$BS storage/myisam/myisampack$BS \

  storage/myisam/myisamlog$BS storage/myisam/myisam_ftdump$BS \

  sql/mysqld$BS sql/mysql_tzinfo_to_sql$BS \

  sql/mysqld$BS sql/mysqld-debug$BS sql/mysql_tzinfo_to_sql$BS \

  server-tools/instance-manager/mysqlmanager$BS \

  client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \

  client/mysqlslap$BS \
@@ -173,8 +173,9 @@ if [ x$STRIP = x1 ] ; then 
  strip $BASE/bin/*

fi



# Copy not binary files

copyfileto $BASE/bin sql/mysqld.sym.gz

# Obsolete, starting from 5.1.6-beta

# # Copy not binary files

# copyfileto $BASE/bin sql/mysqld.sym.gz



if [ $BASE_SYSTEM = "netware" ] ; then

    $CP netware/*.pl $BASE/scripts
@@ -304,11 +305,12 @@ else 
    rm -f $BASE/README.NW

fi



# Make safe_mysqld a symlink to mysqld_safe for backwards portability

# To be removed in MySQL 4.1

if [ $BASE_SYSTEM != "netware" ] ; then

  (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld )

fi

# Dropped with 5.1.6-beta

# # Make safe_mysqld a symlink to mysqld_safe for backwards portability

# # To be removed in MySQL 4.1

# if [ $BASE_SYSTEM != "netware" ] ; then

#   (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld )

# fi



# Clean up if we did this from a bk tree

if [ -d $BASE/sql-bench/SCCS ] ; then

server-tools/instance-manager/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ 
                        mysql_manager_error.h \

                        portability.h



mysqlmanager_LDADD=	liboptions.a \

mysqlmanager_LDADD=	@CLIENT_EXTRA_LDFLAGS@ \

			liboptions.a \

			libnet.a \

			$(top_builddir)/vio/libvio.a \

			$(top_builddir)/mysys/libmysys.a \