^^&&^^

Edit File: partition-dml-1-10.inc

--source include/have_partition.inc
SET @auto= @@global.autocommit;
SET @@global.autocommit= off;
SET @iso= @@global.tx_isolation;
SET @@global.tx_isolation= 'repeatable-read';
SET @completion= @@global.completion_type;
SET @@global.completion_type= 'no_chain';
SET @lock_timeout= @@global.lock_wait_timeout;
SET @@global.lock_wait_timeout= 1;
SELECT @@global.lock_wait_timeout;
SET @innodb_lock_timeout= @@global.innodb_lock_wait_timeout;
SET @@global.innodb_lock_wait_timeout= 1;
let $DATA_PATH=;
let $INDEX_PATH=;

--echo # Additional tests for WL#5217 by QA, testplan 1.1

let $TABLENAME= t1;
--source suite/parts/inc/partition-dml_cr_tab.inc
--source suite/parts/inc/partition-dml_ins_tab.inc

--enable_connect_log

GRANT ALL PRIVILEGES ON test.* TO test_user_1 IDENTIFIED BY 'testpw';
GRANT ALL PRIVILEGES ON test.* TO test_user_2 IDENTIFIED BY 'testpw';
GRANT ALL PRIVILEGES ON test.* TO test_user_3 IDENTIFIED BY 'testpw';

connect (session1, localhost, test_user_1,'testpw',test);
PREPARE st1 FROM 'UPDATE t1 PARTITION (`p0-29`) SET b=''p0-29-upd-1'' WHERE a BETWEEN 0 AND 9' ;

connect (session2, localhost, test_user_2,'testpw',test);
PREPARE st2 FROM 'UPDATE t1 PARTITION (`p0-29`) SET b=? WHERE a BETWEEN 20 AND 29' ;

connection session1;
EXECUTE st1;

connection session2;
SET @var1= 'p0-29-upd-2';
if ($engine == MyISAM)
{
EXECUTE st2 USING @var1;
}
if ($engine == InnoDB)
{
--error ER_LOCK_WAIT_TIMEOUT
EXECUTE st2 USING @var1;
}

connection session1;
COMMIT WORK;

connection session2;
SET @var1= 'p0-29-upd-2';
EXECUTE st2 USING @var1;

connection session1;
SELECT * FROM t1 PARTITION (`p0-29`);
DEALLOCATE PREPARE st1;

connection session2;
SELECT * FROM t1 PARTITION (`p0-29`);
COMMIT WORK;
DEALLOCATE PREPARE st2;

connection default;
disconnect session1;
disconnect session2;

SELECT * FROM t1 PARTITION (`p0-29`);

DROP TABLE t1;
DROP USER test_user_1;
DROP USER test_user_2;
DROP USER test_user_3;

SET @@global.autocommit= @auto;
SET @@global.tx_isolation= @iso;
SET @@global.completion_type= @completion;
SET @@global.lock_wait_timeout= @lock_timeout;
SET @@global.innodb_lock_wait_timeout= @innodb_lock_timeout;