diff options
| author | Igor Babaev <igor@askmonty.org> | 2009-10-26 10:35:14 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2009-10-26 10:35:14 -0700 |
| commit | da47ee7ef90587b3a297ec323703c5b4d187e1a9 (patch) | |
| tree | b0afdec040038054d2fcd84355e55d5848166236 /mysql-test/include | |
| parent | 9d39a137619a43fbc1d293e720eba02d1a0b572c (diff) | |
| parent | f3e3fe866bfaa14986db5bb6a10e5c130af69137 (diff) | |
| download | mariadb-git-da47ee7ef90587b3a297ec323703c5b4d187e1a9.tar.gz | |
Merge of the latest 5.1 changes.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/maria_empty_logs.inc | 6 | ||||
| -rw-r--r-- | mysql-test/include/read_many_rows.inc | 10 | ||||
| -rw-r--r-- | mysql-test/include/wait_for_status_var.inc | 3 |
3 files changed, 12 insertions, 7 deletions
diff --git a/mysql-test/include/maria_empty_logs.inc b/mysql-test/include/maria_empty_logs.inc index 00f92010bd0..bbe6673f10d 100644 --- a/mysql-test/include/maria_empty_logs.inc +++ b/mysql-test/include/maria_empty_logs.inc @@ -1,6 +1,10 @@ # Maria help script. # Cleans up all logs to give recovery a fresh start. - +# +# Note that this script relies on the number of threads connect at start of +# this script, so one should run this script with a freshly started server +# for it to work. +# # API: set mel_keep_control_file=1 if want to keep control file; # uses vardir, port and socket. diff --git a/mysql-test/include/read_many_rows.inc b/mysql-test/include/read_many_rows.inc index ff57c0ca13d..d40086b01df 100644 --- a/mysql-test/include/read_many_rows.inc +++ b/mysql-test/include/read_many_rows.inc @@ -71,8 +71,8 @@ CREATE TRIGGER t1_bi before INSERT BEGIN DECLARE CONTINUE HANDLER FOR SQLSTATE '40001' SET @a:= 'deadlock'; DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET @a:= 'exception'; - INSERT INTO t2 (f2) VALUES (1); - DELETE FROM t2 WHERE f2 = 1; + INSERT INTO t2 (f2) VALUES (NEW.f1); + DELETE FROM t2 WHERE f2 = NEW.f1; END;| CREATE PROCEDURE proc24989() @@ -109,7 +109,7 @@ send insert into t1 values(1); connection con1; --sleep 1 -insert into t1 values(1); +insert into t1 values(123); connection con2; --error 1213 @@ -130,7 +130,7 @@ send call proc24989(); connection con1; --sleep 1 -insert into t1 values(1); +insert into t1 values(123); connection con2; reap; @@ -150,7 +150,7 @@ send call proc24989_2(); connection con1; --sleep 1 -insert into t1 values(1); +insert into t1 values(123); commit; connection con2; diff --git a/mysql-test/include/wait_for_status_var.inc b/mysql-test/include/wait_for_status_var.inc index 4c168da7f1a..6ba632ce46b 100644 --- a/mysql-test/include/wait_for_status_var.inc +++ b/mysql-test/include/wait_for_status_var.inc @@ -51,11 +51,12 @@ if (`SELECT '$_status_var_comparsion' = ''`) } let $_show_status_value= query_get_value("SHOW $status_type STATUS LIKE '$status_var'", Value, 1); + while (`SELECT NOT('$_show_status_value' $_status_var_comparsion '$status_var_value')`) { if (!$_status_timeout_counter) { - --echo **** ERROR: failed while waiting for $status_type $status_var $_status_var_comparison $status_var_value **** + --echo **** ERROR: failed while waiting for '$status_type' '$status_var' $_status_var_comparsion '$status_var_value' **** --echo Note: the following output may have changed since the failure was detected --echo **** Showing STATUS, PROCESSLIST **** eval SHOW $status_type STATUS LIKE '$status_var'; |