Commit 2cb2374b authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/cps/mysql/trees/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged
parents 47527f6a d67f4397

client/Makefile.am

+4 −2
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ LIBS = @CLIENT_LIBS@ 
LDADD=				@CLIENT_EXTRA_LDFLAGS@ \

                                $(top_builddir)/libmysql/libmysqlclient.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen

				mysqldump mysqlimport mysqltest mysqlbinlog \

				mysqltestmanagerc mysqltestmanager-pwgen

noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h

mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc
@@ -33,7 +34,8 @@ mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) 
mysqltest_SOURCES=		mysqltest.c $(top_srcdir)/mysys/my_getsystime.c

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)

mysqlbinlog_SOURCES =   mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c

mysqlmanagerc_SOURCES =   mysqlmanagerc.c 

mysqltestmanagerc_SOURCES =   mysqlmanagerc.c 

mysqltestmanager_pwgen_SOURCES =   mysqlmanager-pwgen.c 

sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c

mysql-test/mysql-test-run.sh

+6 −6
Original line number Diff line number Diff line
@@ -574,9 +574,9 @@ if [ x$SOURCE_DIST = x1 ] ; then 
 CLIENT_BINDIR="$BASEDIR/client"

 MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"

 WAIT_PID="$BASEDIR/extra/mysql_waitpid"

 MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"

 MYSQL_MANAGER="$BASEDIR/tools/mysqlmanager"

 MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqlmanager-pwgen"

 MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqltestmanagerc"

 MYSQL_MANAGER="$BASEDIR/tools/mysqltestmanager"

 MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqltestmanager-pwgen"

 MYSQL="$CLIENT_BINDIR/mysql"

 LANGUAGE="$BASEDIR/sql/share/english/"

 CHARSETSDIR="$BASEDIR/sql/share/charsets"
@@ -637,9 +637,9 @@ else 
 MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"

 MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"

 WAIT_PID="$CLIENT_BINDIR/mysql_waitpid"

 MYSQL_MANAGER="$CLIENT_BINDIR/mysqlmanager"

 MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"

 MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqlmanager-pwgen"

 MYSQL_MANAGER="$CLIENT_BINDIR/mysqltestmanager"

 MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqltestmanagerc"

 MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqltestmanager-pwgen"

 MYSQL="$CLIENT_BINDIR/mysql"

 INSTALL_DB="./install_test_db --bin"

 MYSQL_FIX_SYSTEM_TABLES="$CLIENT_BINDIR/mysql_fix_privilege_tables"

scripts/make_binary_distribution.sh

+6 −5
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ 
  myisam/myisamchk$BS myisam/myisampack$BS myisam/myisamlog$BS \

  myisam/myisam_ftdump$BS \

  sql/mysqld$BS sql/mysql_tzinfo_to_sql$BS \

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

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

  client/mysqldump$BS client/mysqlimport$BS \

  client/mysqltest$BS client/mysqlcheck$BS \
@@ -122,13 +123,13 @@ if [ $BASE_SYSTEM = "netware" ] ; then 
# For all other platforms:

else

  BIN_FILES="$BIN_FILES \

    client/mysqlmanagerc \

    client/mysqlmanager-pwgen tools/mysqlmanager \

    client/mysqltestmanagerc \

    client/mysqltestmanager-pwgen tools/mysqltestmanager \

    client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \

    client/.libs/mysqldump client/.libs/mysqlimport \

    client/.libs/mysqltest client/.libs/mysqlcheck \

    client/.libs/mysqlbinlog client/.libs/mysqlmanagerc \

    client/.libs/mysqlmanager-pwgen tools/.libs/mysqlmanager \

    client/.libs/mysqlbinlog client/.libs/mysqltestmanagerc \

    client/.libs/mysqltestmanager-pwgen tools/.libs/mysqltestmanager \

    tests/.libs/mysql_client_test \

    libmysqld/examples/.libs/mysql_client_test_embedded \

    libmysqld/examples/.libs/mysqltest_embedded \
@@ -231,7 +232,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then 
  chmod a+x $BASE/bin/*

  $CP scripts/* $BASE/bin

  $BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ \@pkgdatadir\@ ./support-files < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db

  $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server

  $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@sbindir\@ ./bin \@MYSQLD_USER\@ mysql \@localstatedir\@ /usr/local/mysql/data \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server

  $BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/mysqld_safe

  mv $BASE/support-files/binary-configure $BASE/configure

  chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* $BASE/support-files/mysql.server $BASE/configure

server-tools/instance-manager/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ noinst_LIBRARIES= liboptions.a libnet.a 
liboptions_a_CXXFLAGS= $(CXXFLAGS) \

	-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \

	-DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \

	-DDEFAULT_SOCKET_FILE_NAME="$(localstatedir)/mysqlmanager.sock" \

	-DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \

	-DDEFAULT_PASSWORD_FILE_NAME="$(sysconfdir)/mysqlmanager.passwd" \

	-DDEFAULT_MYSQLD_PATH="$(libexecdir)/mysqld$(EXEEXT)" \

	-DDEFAULT_MONITORING_INTERVAL="20" \

support-files/mysql.spec.sh

+9 −4
Original line number Diff line number Diff line
@@ -675,9 +675,9 @@ fi 
%defattr(-, root, root, 0755)

%attr(-, root, root) %{_datadir}/sql-bench

%attr(-, root, root) %{_datadir}/mysql-test

%attr(755, root, root) %{_bindir}/mysqlmanager

%attr(755, root, root) %{_bindir}/mysqlmanager-pwgen

%attr(755, root, root) %{_bindir}/mysqlmanagerc

%attr(755, root, root) %{_bindir}/mysqltestmanager

%attr(755, root, root) %{_bindir}/mysqltestmanager-pwgen

%attr(755, root, root) %{_bindir}/mysqltestmanagerc



%files Max

%defattr(-, root, root, 0755)
@@ -692,6 +692,11 @@ fi 
# itself - note that they must be ordered by date (important when

# merging BK trees)

%changelog

* Mon Apr 4 2005 Petr Chardin <petr@mysql.com>



- old mysqlmanager, mysqlmanagerc and mysqlmanager-pwger renamed into

  mysqltestmanager, mysqltestmanager and mysqltestmanager-pwgen respectively



* Fri Mar 18 2005 Lenz Grimmer <lenz@mysql.com>



- Disabled RAID in the Max binaries once and for all (it has finally been