mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
msvensson@neptunus.(none)
commit
430b493806
7 changed files with 81 additions and 43 deletions
11
mysql-test/include/report-features.test
Normal file
11
mysql-test/include/report-features.test
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#
|
||||
# show server variables
|
||||
#
|
||||
|
||||
--disable_query_log
|
||||
--echo ===== ENGINES =====
|
||||
show engines;
|
||||
--echo ===== VARIABLES =====
|
||||
show variables;
|
||||
--echo ===== STOP =====
|
||||
--enable_query_log
|
||||
|
|
@ -1815,10 +1815,13 @@ run_testcase ()
|
|||
--result-file=*)
|
||||
result_file=`$ECHO "$EXTRA_MASTER_OPT" | $SED -e "s;--result-file=;;"`
|
||||
result_file="r/$result_file.result"
|
||||
# Note that this must be set to space, not "" for test-reset to
|
||||
# work
|
||||
# Note that this must be set to space, not "" for test-reset to work
|
||||
EXTRA_MASTER_OPT=" "
|
||||
;;
|
||||
--force-restart)
|
||||
# Note that this must be set to space, not "" for test-reset to work
|
||||
EXTRA_MASTER_OPT=" "
|
||||
;;
|
||||
esac
|
||||
stop_master
|
||||
stop_master 1
|
||||
|
|
|
|||
|
|
@ -428,10 +428,14 @@ sub main () {
|
|||
if ( ! $need_im )
|
||||
{
|
||||
$opt_skip_im= 1;
|
||||
}
|
||||
}
|
||||
|
||||
initialize_servers();
|
||||
|
||||
if ( $opt_report_features ) {
|
||||
run_report_features();
|
||||
}
|
||||
|
||||
run_suite($opt_suite, $tests);
|
||||
}
|
||||
|
||||
|
|
@ -596,6 +600,7 @@ sub command_line_setup () {
|
|||
'mem' => \$opt_mem,
|
||||
|
||||
# Misc
|
||||
'report-features' => \$opt_report_features,
|
||||
'comment=s' => \$opt_comment,
|
||||
'debug' => \$opt_debug,
|
||||
'fast' => \$opt_fast,
|
||||
|
|
@ -4263,6 +4268,43 @@ sub run_check_testcase ($$) {
|
|||
return $res;
|
||||
}
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Report the features that were compiled in
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
sub run_report_features () {
|
||||
my $args;
|
||||
|
||||
if ( ! $glob_use_embedded_server )
|
||||
{
|
||||
mysqld_start($master->[0],[],[]);
|
||||
if ( ! $master->[0]->{'pid'} )
|
||||
{
|
||||
mtr_error("Can't start the mysqld server");
|
||||
}
|
||||
mysqld_wait_started($master->[0]);
|
||||
}
|
||||
|
||||
my $tinfo = {};
|
||||
$tinfo->{'name'} = 'report features';
|
||||
$tinfo->{'result_file'} = undef;
|
||||
$tinfo->{'component_id'} = 'mysqld';
|
||||
$tinfo->{'path'} = 'include/report-features.test';
|
||||
$tinfo->{'timezone'}= "GMT-3";
|
||||
$tinfo->{'slave_num'} = 0;
|
||||
$tinfo->{'master_opt'} = [];
|
||||
$tinfo->{'slave_opt'} = [];
|
||||
$tinfo->{'slave_mi'} = [];
|
||||
$tinfo->{'comment'} = 'report server features';
|
||||
run_mysqltest($tinfo);
|
||||
|
||||
if ( ! $glob_use_embedded_server )
|
||||
{
|
||||
stop_all_servers();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
sub run_mysqltest ($) {
|
||||
|
|
@ -4400,8 +4442,10 @@ sub run_mysqltest ($) {
|
|||
mtr_add_arg($args, "--test-file");
|
||||
mtr_add_arg($args, $tinfo->{'path'});
|
||||
|
||||
mtr_add_arg($args, "--result-file");
|
||||
mtr_add_arg($args, $tinfo->{'result_file'});
|
||||
if ( defined $tinfo->{'result_file'} ) {
|
||||
mtr_add_arg($args, "--result-file");
|
||||
mtr_add_arg($args, $tinfo->{'result_file'});
|
||||
}
|
||||
|
||||
if ( $opt_record )
|
||||
{
|
||||
|
|
@ -4814,3 +4858,4 @@ HERE
|
|||
mtr_exit(1);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
2
mysql-test/r/have_mysql_upgrade.result
Normal file
2
mysql-test/r/have_mysql_upgrade.result
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
have_mysql_upgrade
|
||||
1
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# Only run test if "mysql_upgrade" is found
|
||||
--require r/have_mysql_upgrade.inc
|
||||
--require r/have_mysql_upgrade.result
|
||||
--disable_query_log
|
||||
select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade;
|
||||
--enable_query_log
|
||||
|
|
|
|||
|
|
@ -17,11 +17,6 @@
|
|||
|
||||
## Process this file with automake to create Makefile.in
|
||||
|
||||
if HAVE_YASSL
|
||||
yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp
|
||||
else
|
||||
yassl_dummy_link_fix=
|
||||
endif
|
||||
|
||||
if THREAD_SAFE_CLIENT
|
||||
LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql_r/libmysqlclient_r.la
|
||||
|
|
@ -42,9 +37,6 @@ EXTRA_DIST = auto_increment.res auto_increment.tst \
|
|||
bin_PROGRAMS = mysql_client_test
|
||||
noinst_PROGRAMS = insert_test select_test thread_test
|
||||
|
||||
#
|
||||
# C Test for 4.1 protocol
|
||||
#
|
||||
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
||||
$(openssl_includes)
|
||||
LIBS = @CLIENT_LIBS@
|
||||
|
|
@ -52,11 +44,11 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \
|
|||
$(LIBMYSQLCLIENT_LA)
|
||||
|
||||
mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS)
|
||||
mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \
|
||||
mysql_client_test_SOURCES= mysql_client_test.c\
|
||||
$(top_srcdir)/mysys/my_memmem.c
|
||||
|
||||
insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix)
|
||||
select_test_SOURCES= select_test.c $(yassl_dummy_link_fix)
|
||||
insert_test_SOURCES= insert_test.c
|
||||
select_test_SOURCES= select_test.c
|
||||
insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
|
||||
select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,43 +1,28 @@
|
|||
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
||||
#
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
if HAVE_YASSL
|
||||
yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp
|
||||
else
|
||||
yassl_dummy_link_fix=
|
||||
endif
|
||||
INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \
|
||||
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
||||
$(openssl_includes)
|
||||
LDADD= @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
|
||||
pkglib_LIBRARIES= libvio.a
|
||||
noinst_PROGRAMS = test-ssl test-sslserver test-sslclient
|
||||
noinst_HEADERS= vio_priv.h
|
||||
test_ssl_SOURCES= test-ssl.c $(yassl_dummy_link_fix)
|
||||
test_ssl_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
|
||||
../mysys/libmysys.a ../strings/libmystrings.a \
|
||||
$(openssl_libs) $(yassl_libs)
|
||||
test_sslserver_SOURCES= test-sslserver.c $(yassl_dummy_link_fix)
|
||||
test_sslserver_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
|
||||
../mysys/libmysys.a ../strings/libmystrings.a \
|
||||
$(openssl_libs) $(yassl_libs)
|
||||
test_sslclient_SOURCES= test-sslclient.c $(yassl_dummy_link_fix)
|
||||
test_sslclient_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \
|
||||
../mysys/libmysys.a ../strings/libmystrings.a \
|
||||
$(openssl_libs) $(yassl_libs)
|
||||
libvio_a_SOURCES= vio.c viosocket.c viossl.c viosslfactories.c
|
||||
LDADD = @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
|
||||
pkglib_LIBRARIES = libvio.a
|
||||
|
||||
noinst_HEADERS = vio_priv.h
|
||||
|
||||
libvio_a_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c
|
||||
|
||||
EXTRA_DIST= CMakeLists.txt
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
|
|
|
|||
Loading…
Reference in a new issue