diff options
| author | unknown <rafal@quant.(none)> | 2007-08-27 14:01:19 +0200 |
|---|---|---|
| committer | unknown <rafal@quant.(none)> | 2007-08-27 14:01:19 +0200 |
| commit | f7bb00abee078b5cb567eb464305d2ebde393ed5 (patch) | |
| tree | 4a3c54f9e841d93b2ba708aa041f2081682b5f7b /mysql-test/t/status.test | |
| parent | c4930ac017c944854e3a0aaeac7a8eb037f774b4 (diff) | |
| parent | 642eda22295b89d095c5d3d86f8c7c87d28e5131 (diff) | |
| download | mariadb-git-f7bb00abee078b5cb567eb464305d2ebde393ed5.tar.gz | |
Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22
into quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-rpl
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_record.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/log_event.cc:
Manual merge.
sql/log_event.h:
Manual merge.
sql/log_event_old.h:
Manual merge.
Diffstat (limited to 'mysql-test/t/status.test')
| -rw-r--r-- | mysql-test/t/status.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test index 9fd54d4766d..c16b22c035c 100644 --- a/mysql-test/t/status.test +++ b/mysql-test/t/status.test @@ -33,8 +33,8 @@ let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST where ID = $ID unlock tables; connection con1; reap; -show status like 'Table_lock%'; -select * from information_schema.session_status where variable_name like 'Table_lock%'; +show status like 'Table_locks_waited%'; +select * from information_schema.session_status where variable_name like 'Table_locks_waited%'; drop table t1; disconnect con2; |