mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Fixes for OSF1
Made test more reliable on slow machines
This commit is contained in:
@ -43,8 +43,6 @@ PATH=$PATH:/usr/bsd
|
||||
hostname=`hostname` # Install this too in the user table
|
||||
hostname="$hostname%" # Fix if not fully qualified hostname
|
||||
|
||||
resolved=127.0.0.1
|
||||
|
||||
|
||||
#create the directories
|
||||
[ -d $vardir ] || mkdir $vardir
|
||||
@ -144,9 +142,7 @@ then
|
||||
|
||||
i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
|
||||
INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
|
||||
|
||||
REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
|
||||
REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
|
||||
REPLACE INTO user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
|
||||
|
||||
INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
|
||||
INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');"
|
||||
|
@ -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 ()
|
||||
{
|
||||
|
@ -7,7 +7,7 @@ Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Rep
|
||||
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db
|
||||
127.0.0.1 root 9306 60 4 No
|
||||
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db
|
||||
127.0.0.1 root 9306 60 4 Yes
|
||||
127.0.0.1 root 9306 60 master-bin.001 73 Yes
|
||||
n
|
||||
10
|
||||
45
|
||||
|
@ -13,6 +13,7 @@ change master to master_host='127.0.0.1',master_user='root',
|
||||
master_password='',master_port=9306;
|
||||
show slave status;
|
||||
slave start;
|
||||
sleep 3;
|
||||
show slave status;
|
||||
connection master;
|
||||
drop table if exists foo;
|
||||
|
@ -27,6 +27,7 @@ create table t2(m int);
|
||||
insert into t2 values (34),(67),(123);
|
||||
flush logs;
|
||||
show master logs;
|
||||
sleep 2; # If a slow machine
|
||||
purge master logs to 'master-bin.003';
|
||||
show master logs;
|
||||
insert into t2 values (65);
|
||||
|
Reference in New Issue
Block a user