1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Fixes for OSF1

Made test more reliable on slow machines


Docs/manual.texi:
  Changelog
client/mysqladmin.c:
  Made --silent more silent
include/my_pthread.h:
  Removed warning on OSF1
mysql-test/install_test_db.sh:
  Allow connections from 127.0.0.1
mysql-test/mysql-test-run.sh:
  Use mysqladmin ping to test if server is up
mysql-test/r/rpl000015.result:
  Added sleep to make results repeatable
mysql-test/t/rpl000015.test:
  Added sleep to make results repeatable
mysql-test/t/rpl000016.test:
  Added sleep to make results repeatable
sql/sql_repl.cc:
  added DBUG entry
sql/sql_table.cc:
  Removed comparison of virtual functions as this didn't work on
  Compaq C++ on OSF1
This commit is contained in:
unknown
2001-01-22 15:33:34 +02:00
parent 6632102983
commit 3e54e53932
10 changed files with 104 additions and 100 deletions

View File

@ -35,6 +35,7 @@ RM=rm
TIME=time
TR=tr
XARGS=`which xargs | head -1`
SED=sed
# Are we using a source or a binary distribution?
@ -72,7 +73,7 @@ BASEDIR=`pwd`
cd $CWD
MYSQL_TEST_DIR=$BASEDIR/mysql-test
STD_DATA=$MYSQL_TEST_DIR/std_data
SED=sed
hostname=`hostname` # Installed in the mysql privilege table
TESTDIR="$MYSQL_TEST_DIR/t/"
TESTSUFFIX=test
@ -238,10 +239,9 @@ SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov
# Function Definitions
#--
wait_for_server_start ()
{
$MYSQL --no-defaults -u $DBUSER -e "select 1" --silent -w1 --host=127.0.0.1 --port=$1 \
>/dev/null
}
{
$MYSQLADMIN --no-defaults -u $DBUSER --silent -w2 --host=$hostname --port=$1 ping >/dev/null
}
prompt_user ()
{