Below is the list of changes that have just been committed into a local
6.0 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-12-20 10:57:11-05:00, cmiller@stripped +7 -0
Profiling adds a new entry to I_S and the "Locked" proc_info state
changed to "Table lock".
mysql-test/r/information_schema.result@stripped, 2007-12-20 10:57:05-05:00, cmiller@stripped +1 -1
+ profiling
mysql-test/r/sp-threads.result@stripped, 2007-12-20 10:57:06-05:00, cmiller@stripped +1 -1
"Locked" state renamed to "Table lock"
mysql-test/t/insert_notembedded.test@stripped, 2007-12-20 10:57:06-05:00, cmiller@stripped +1 -1
"Locked" state renamed to "Table lock"
mysql-test/t/lock_multi.test@stripped, 2007-12-20 10:57:06-05:00, cmiller@stripped +10 -11
"Locked" state renamed to "Table lock"
mysql-test/t/sp_notembedded.test@stripped, 2007-12-20 10:57:06-05:00, cmiller@stripped +1 -1
"Locked" state renamed to "Table lock"
mysql-test/t/status.test@stripped, 2007-12-20 10:57:06-05:00, cmiller@stripped +1 -1
"Locked" state renamed to "Table lock"
sql/sql_class.h@stripped, 2007-12-20 10:57:06-05:00, cmiller@stripped +3 -3
Use methods to change states. Profiling requires this.
diff -Nrup a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result 2007-12-19 08:34:58 -05:00
+++ b/mysql-test/r/information_schema.result 2007-12-20 10:57:05 -05:00
@@ -855,7 +855,7 @@ delete from mysql.db where user='mysqlte
flush privileges;
SELECT table_schema, count(*) FROM information_schema.TABLES where table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA;
table_schema count(*)
-information_schema 28
+information_schema 29
mysql 22
create table t1 (i int, j int);
create trigger trg1 before insert on t1 for each row
diff -Nrup a/mysql-test/r/sp-threads.result b/mysql-test/r/sp-threads.result
--- a/mysql-test/r/sp-threads.result 2007-11-01 14:37:47 -04:00
+++ b/mysql-test/r/sp-threads.result 2007-12-20 10:57:06 -05:00
@@ -35,7 +35,7 @@ call bug9486();
show processlist;
Id User Host db Command Time State Info
# root localhost test Sleep # NULL NULL
-# root localhost test Query # Locked update t1, t2 set val= 1 where id1=id2
+# root localhost test Query # Table lock update t1, t2 set val= 1 where id1=id2
# root localhost test Query # NULL show processlist
# root localhost test Sleep # NULL NULL
unlock tables;
diff -Nrup a/mysql-test/t/insert_notembedded.test b/mysql-test/t/insert_notembedded.test
--- a/mysql-test/t/insert_notembedded.test 2007-10-02 20:27:23 -04:00
+++ b/mysql-test/t/insert_notembedded.test 2007-12-20 10:57:06 -05:00
@@ -174,7 +174,7 @@ connection default;
# we must wait till the insert opens and locks the table
let $wait_condition=
select count(*) = 1 from information_schema.processlist
- where state = "Locked" and id = $ID;
+ where state = "Table lock" and id = $ID;
--source include/wait_condition.inc
connect (select,localhost,root,,);
--echo connection: select
diff -Nrup a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test
--- a/mysql-test/t/lock_multi.test 2007-12-14 07:10:17 -05:00
+++ b/mysql-test/t/lock_multi.test 2007-12-20 10:57:06 -05:00
@@ -18,13 +18,13 @@ send update low_priority t1 set n = 4;
connection reader;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
- where state = "Locked" and info = "update low_priority t1 set n = 4";
+ where state = "Table lock" and info = "update low_priority t1 set n = 4";
--source include/wait_condition.inc
send select n from t1;
connection locker;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
- where state = "Locked" and info = "select n from t1";
+ where state = "Table lock" and info = "select n from t1";
--source include/wait_condition.inc
unlock tables;
connection writer;
@@ -42,7 +42,7 @@ send update low_priority t1 set n = 4;
connection reader;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
- where state = "Locked" and info = "update low_priority t1 set n = 4";
+ where state = "Table lock" and info = "update low_priority t1 set n = 4";
--source include/wait_condition.inc
select n from t1;
connection locker;
@@ -86,7 +86,7 @@ send insert t1 select * from t2;
connection locker;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
- where state = "Locked" and info = "insert t1 select * from t2";
+ where state = "Table lock" and info = "insert t1 select * from t2";
--source include/wait_condition.inc
drop table t2;
connection reader;
@@ -108,7 +108,7 @@ send insert t1 select * from t2;
connection locker;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
- where state = "Locked" and info = "insert t1 select * from t2";
+ where state = "Table lock" and info = "insert t1 select * from t2";
--source include/wait_condition.inc
drop table t2;
connection reader;
@@ -277,13 +277,13 @@ send alter table t1 auto_increment=0;
connection reader;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
- where state = "Locked" and info = "alter table t1 auto_increment=0";
+ where state = "Table lock" and info = "alter table t1 auto_increment=0";
--source include/wait_condition.inc
send alter table t1 auto_increment=0;
connection locker;
let $wait_condition=
select count(*) = 2 from information_schema.processlist
- where state = "Locked" and info = "alter table t1 auto_increment=0";
+ where state = "Table lock" and info = "alter table t1 auto_increment=0";
--source include/wait_condition.inc
unlock tables;
connection writer;
@@ -295,7 +295,6 @@ drop table t1;
#
--echo End of 5.0 tests
-
#
# Bug #21281 "Pending write lock is incorrectly removed when its
# statement being KILLed"
@@ -308,15 +307,15 @@ connection writer;
connection reader;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
- where state = "Locked" and info = "update t1 set i= 10";
+ where state = "Table lock" and info = "update t1 set i= 10";
--source include/wait_condition.inc
--send select * from t1;
connection default;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
- where state = "Locked" and info = "select * from t1";
+ where state = "Table lock" and info = "select * from t1";
--source include/wait_condition.inc
-let $ID= `select id from information_schema.processlist where state = "Locked" and info = "update t1 set i= 10"`;
+let $ID= `select id from information_schema.processlist where state = "Table lock" and info = "update t1 set i= 10"`;
--replace_result $ID ID
eval kill query $ID;
connection reader;
diff -Nrup a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test
--- a/mysql-test/t/sp_notembedded.test 2007-11-20 14:45:47 -05:00
+++ b/mysql-test/t/sp_notembedded.test 2007-12-20 10:57:06 -05:00
@@ -310,7 +310,7 @@ set session low_priority_updates=on;
connection rl_wait;
let $wait_condition=
select count(*) = 1 from information_schema.processlist
- where state = "Locked" and
+ where state = "Table lock" and
info = "update t1 set value='updated' where value='old'";
--source include/wait_condition.inc
diff -Nrup a/mysql-test/t/status.test b/mysql-test/t/status.test
--- a/mysql-test/t/status.test 2007-10-16 04:43:14 -04:00
+++ b/mysql-test/t/status.test 2007-12-20 10:57:06 -05:00
@@ -50,7 +50,7 @@ update t1 set n = 3;
connection con2;
# wait for the other query to start executing
-let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST where ID = $ID and STATE = "Locked";
+let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST where ID = $ID and STATE = "Table lock";
# Immediate = 14 + $wait_condition_reps ($wait_timeout is 0, so no extra select
# is done inside wait_condition.inc)
--source include/wait_condition.inc
diff -Nrup a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h 2007-12-19 08:41:36 -05:00
+++ b/sql/sql_class.h 2007-12-20 10:57:06 -05:00
@@ -1783,11 +1783,11 @@ public:
inline const char* enter_cond(pthread_cond_t *cond, pthread_mutex_t* mutex,
const char* msg)
{
- const char* old_msg = proc_info;
+ const char* old_msg = get_proc_info();
safe_mutex_assert_owner(mutex);
mysys_var->current_mutex = mutex;
mysys_var->current_cond = cond;
- proc_info = msg;
+ thd_proc_info(this, msg);
return old_msg;
}
inline void exit_cond(const char* old_msg)
@@ -1802,7 +1802,7 @@ public:
pthread_mutex_lock(&mysys_var->mutex);
mysys_var->current_mutex = 0;
mysys_var->current_cond = 0;
- proc_info = old_msg;
+ thd_proc_info(this, old_msg);
pthread_mutex_unlock(&mysys_var->mutex);
}
inline time_t query_start() { query_start_used=1; return start_time; }
| Thread |
|---|
| • bk commit into 6.0 tree (cmiller:1.2501) | Chad MILLER | 20 Dec |
