database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Use our version of RWLOCKS on UNIXWARE 7

Browse Source 
More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL
This commit is contained in:
monty@hundin.mysql.fi
2002-08-21 22:04:22 +03:00
parent a5edb20042
commit 03b0179af9
50 changed files with 407 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mysql-test/mysql-test-run.sh
View File

@ -93,7 +93,7 @@ FIND=find
GCOV=`which gcov | $SED q`
PRINTF=printf
RM=rm
TIME=time
TIME=`which time | $SED q`
TR=tr
XARGS=`which xargs | $SED q`
@ -391,7 +391,12 @@ if [ x$SOURCE_DIST = x1 ] ; then
CHARSETSDIR="$BASEDIR/sql/share/charsets"
INSTALL_DB="./install_test_db"
else
MYSQLD="$BASEDIR/bin/mysqld"
if test -x "$BASEDIR/libexec/mysqld"
then
MYSQLD="$BASEDIR/libexec/mysqld"
else
MYSQLD="$BASEDIR/bin/mysqld"
fi
MYSQL_TEST="$BASEDIR/bin/mysqltest"
MYSQLADMIN="$BASEDIR/bin/mysqladmin"
MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager"
@ -530,6 +535,18 @@ total_inc () {
TOT_TEST=`$EXPR $TOT_TEST + 1`
}
skip_test() {
USERT=" ...."
SYST=" ...."
REALT=" ...."
timestr="$USERT $SYST $REALT"
pname=`$ECHO "$1 "|$CUT -c 1-24`
RES="$pname $timestr"
skip_inc
$ECHO "$RES$RES_SPACE [ skipped ]"
}
report_stats () {
if [ $TOT_FAIL = 0 ]; then
$ECHO "All $TOT_TEST tests were successful."
@ -567,7 +584,7 @@ mysql_install_db () {
for slave_num in 1 2 ;
do
$RM -rf var/slave$slave_num-data/
$RM -rf var/slave$slave_num-data
mkdir -p var/slave$slave_num-data/mysql
mkdir -p var/slave$slave_num-data/test
cp var/slave-data/mysql/* var/slave$slave_num-data/mysql
@ -1026,7 +1043,8 @@ run_testcase ()
SKIP_THIS_TEST=`$EXPR \( $tname : "$SKIP_TEST" \) != 0`
if [ x$SKIP_THIS_TEST = x1 ] ;
then
return;
skip_test $tname;
return;
fi
fi
@ -1034,21 +1052,15 @@ run_testcase ()
DO_THIS_TEST=`$EXPR \( $tname : "$DO_TEST" \) != 0`
if [ x$DO_THIS_TEST = x0 ] ;
then
return;
skip_test $tname;
return;
fi
fi
if [ x${NO_SLAVE}x$SKIP_SLAVE = x1x0 ] ;
then
USERT=" ...."
SYST=" ...."
REALT=" ...."
timestr="$USERT $SYST $REALT"
pname=`$ECHO "$tname "|$CUT -c 1-24`
RES="$pname $timestr"
skip_inc
$ECHO "$RES$RES_SPACE [ skipped ]"
skip_test $tname;
return
fi

4
mysql-test/r/rpl_empty_master_crash.result
View File

@ -8,4 +8,6 @@ drop table if exists t1;
show slave status;
Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
load table t1 from master;
Error in fetch_master_table
Error connecting to master: Master is not configured
load table t1 from master;
Error from master: 'Table 'test.t1' doesn't exist'

18
mysql-test/r/rpl000014.result → mysql-test/r/rpl_log_pos.result
View File

@ -19,22 +19,24 @@ Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Lo
slave start;
show slave status;
Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.001 73 slave-relay-bin.001 4 master-bin.001 Yes Yes 0 0 73 4
127.0.0.1 root MASTER_PORT 1 master-bin.001 73 slave-relay-bin.001 4 master-bin.001 No Yes 0 0 73 4
change master to master_log_pos=173;
slave start;
show slave status;
Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.001 173 slave-relay-bin.001 4 master-bin.001 Yes Yes 0 0 173 4
127.0.0.1 root MASTER_PORT 1 master-bin.001 173 slave-relay-bin.001 4 master-bin.001 No Yes 0 0 173 4
show master status;
File Position Binlog_do_db Binlog_ignore_db
master-bin.001 79
create table if not exists foo(n int);
drop table if exists foo;
create table foo (n int);
insert into foo values (1),(2),(3);
create table if not exists t1 (n int);
drop table if exists t1;
create table t1 (n int);
insert into t1 values (1),(2),(3);
change master to master_log_pos=79;
select * from foo;
slave start;
select * from t1;
n
1
2
3
drop table foo;
drop table t1;

6
mysql-test/t/rpl_empty_master_crash.test
View File

@ -1,5 +1,11 @@
source include/master-slave.inc;
drop table if exists t1;
show slave status;
#
# Load table should not succeed on the master as this is not a slave
#
--error 1218
load table t1 from master;
connection slave;
--error 1188
load table t1 from master;

19
mysql-test/t/rpl000014.test → mysql-test/t/rpl_log_pos.test
View File

@ -1,3 +1,6 @@
#
# Testing of setting slave to wrong log position with master_log_pos
#
source include/master-slave.inc;
show master status;
save_master_pos;
@ -12,24 +15,28 @@ change master to master_log_pos=73;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
show slave status;
slave start;
sleep 2;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
show slave status;
change master to master_log_pos=173;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
slave start;
sleep 2;
show slave status;
connection master;
show master status;
create table if not exists foo(n int);
drop table if exists foo;
create table foo (n int);
insert into foo values (1),(2),(3);
create table if not exists t1 (n int);
drop table if exists t1;
create table t1 (n int);
insert into t1 values (1),(2),(3);
save_master_pos;
connection slave;
change master to master_log_pos=79;
slave start;
sync_with_master;
select * from foo;
select * from t1;
connection master;
drop table foo;
drop table t1;
save_master_pos;
connection slave;
sync_with_master;