Merged mysql-5.6-test-fixes and resolved conflicts

This commit is contained in:
Brian Fraser
2012-12-19 13:47:54 -03:00
41 changed files with 1231 additions and 193 deletions

View File

@@ -334,11 +334,10 @@ case $opt in
../util/check-load-data
ping=$(/tmp/12345/use -ss -e "SELECT MD5(RAND())")
/tmp/12345/use -e "create table percona_test.sentinel(id int primary key, ping varchar(64) not null default '')"
/tmp/12345/use -e "insert into percona_test.sentinel(id, ping) values(1, '$ping')";
/tmp/12345/use -e "UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1";
echo -n "Waiting for replication to finish..."
for i in $(_seq 60); do
pong=$(/tmp/12347/use -ss -e 'select ping from percona_test.sentinel where id=1' 2>/dev/null)
pong=$(/tmp/12347/use -ss -e 'SELECT ping FROM percona_test.sentinel WHERE id=1' 2>/dev/null)
[ "$ping" = "$pong" ] && break
echo -n '.'
sleep 1