database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release

Browse Source 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
This commit is contained in:
kent@mysql.com
2005-12-14 13:18:24 +01:00
parent 45b81ac196 fa5f802746
commit c11b35d9bf
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/rpl_relayrotate.result
View File

@@ -10,9 +10,6 @@ reset slave;
start slave;
stop slave;
start slave;
select master_pos_wait('master-bin.001',3000)>=0;
master_pos_wait('master-bin.001',3000)>=0
1
select max(a) from t1;
max(a)
8000

4
mysql-test/t/mysqltest.test
View File

@@ -968,9 +968,9 @@ drop table t1;
--error 1
--exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out
# The .out file should be empty, cat will fail!
# The .out file should be empty
--error 1
--exec cat $MYSQL_TEST_DIR/var/tmp/bug11731.out
--exec test -s $MYSQL_TEST_DIR/var/tmp/bug11731.out
drop table t1;

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

@@ -58,7 +58,7 @@ while ($1)
enable_query_log;
select * from t1 for update;
start slave;
--sleep 3 # hope that slave is blocked now
--real_sleep 3 # hope that slave is blocked now
insert into t2 values(22); # provoke deadlock, slave should be victim
commit;
sync_with_master;
@@ -76,7 +76,7 @@ change master to master_log_pos=532; # the BEGIN log event
begin;
select * from t2 for update; # hold lock
start slave;
--sleep 10 # slave should have blocked, and be retrying
--real_sleep 10 # slave should have blocked, and be retrying
commit;
sync_with_master;
select * from t1; # check that slave succeeded finally
@@ -97,7 +97,7 @@ change master to master_log_pos=532;
begin;
select * from t2 for update;
start slave;
--sleep 10
--real_sleep 10
commit;
sync_with_master;
select * from t1;

5
mysql-test/t/rpl_relayrotate.test
View File

@@ -52,9 +52,8 @@ start slave;
# which proves that the transaction restarted at
# the right place.
# We must wait for the transaction to commit before
# reading, MASTER_POS_WAIT() will do it for sure
# (the only statement with position>=3000 is COMMIT).
select master_pos_wait('master-bin.001',3000)>=0;
# reading:
sync_with_master;
select max(a) from t1;
connection master;

2
mysql-test/t/trigger-compat.test
View File

@@ -61,7 +61,7 @@ CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1
--echo
--echo ---> patching t1.TRG...
--exec grep --text -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec grep -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG
#

2
mysql-test/t/trigger-grant.test
View File

@@ -449,7 +449,7 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1
FOR EACH ROW
SET @a = 5;
--exec egrep --text -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec egrep -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG