Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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
1.2244 06/03/28 10:42:46 andrey@lmy004. +4 -0
Merge ahristov@stripped:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug14356
mysql-test/t/events_bugs.test
1.6 06/03/28 10:42:40 andrey@lmy004. +0 -0
Auto merged
mysql-test/t/events.test
1.25 06/03/28 10:42:40 andrey@lmy004. +0 -8
Auto merged
mysql-test/r/events_bugs.result
1.7 06/03/28 10:42:40 andrey@lmy004. +0 -0
Auto merged
mysql-test/r/events.result
1.29 06/03/28 10:42:40 andrey@lmy004. +0 -22
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: andrey
# Host: lmy004.
# Root: /work/mysql-5.1-bug14356/RESYNC
--- 1.28/mysql-test/r/events.result 2006-03-16 16:40:51 +01:00
+++ 1.29/mysql-test/r/events.result 2006-03-28 10:42:40 +02:00
@@ -237,7 +237,7 @@ SHOW CREATE TABLE mysql.event;
Table Create Table
event CREATE TABLE `event` (
`db` char(20) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
- `name` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+ `name` char(64) NOT NULL DEFAULT '',
`body` longblob NOT NULL,
`definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
`execute_at` datetime DEFAULT NULL,
--- 1.6/mysql-test/r/events_bugs.result 2006-03-24 17:58:19 +01:00
+++ 1.7/mysql-test/r/events_bugs.result 2006-03-28 10:42:40 +02:00
@@ -50,11 +50,10 @@ select get_lock('test_bug16407', 60);
drop table "hashed_num";
end|
"Now if everything is fine the event has compiled and is locked
-show processlist;
-Id User Host db Command Time State Info
-# root localhost events_test Query # NULL show processlist
-# event_scheduler localhost NULL Connect # Sleeping NULL
-# root localhost events_test Connect # User lock select get_lock('test_bug16407', 60)
+select /*1*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
+user host db command state info
+event_scheduler localhost NULL Connect Sleeping NULL
+root localhost events_test Connect User lock select get_lock('test_bug16407', 60)
select release_lock('test_bug16407');
release_lock('test_bug16407')
1
@@ -75,7 +74,7 @@ create table events_smode_test(ev_name c
"This should never insert something"
create event ee_16407_2 on schedule every 60 second do
begin
-select get_lock('ee_16407_2', 60);
+select get_lock('ee_16407_2', 60) /*ee_16407_2*/;
insert into events_test.events_smode_test values('ee_16407_2','1980-19-02');
end|
insert into events_smode_test values ('test','1980-19-02')|
@@ -83,7 +82,7 @@ ERROR 22007: Incorrect date value: '1980
"This is ok"
create event ee_16407_3 on schedule every 60 second do
begin
-select get_lock('ee_16407_2', 60);
+select get_lock('ee_16407_2', 60) /*ee_16407_3*/;
insert into events_test.events_smode_test values ('ee_16407_3','1980-02-19');
insert into events_test.events_smode_test values ('ee_16407_3','1980-02-29');
end|
@@ -91,7 +90,7 @@ set sql_mode=""|
"This will insert rows but they will be truncated"
create event ee_16407_4 on schedule every 60 second do
begin
-select get_lock('ee_16407_2', 60);
+select get_lock('ee_16407_2', 60) /*ee_16407_4*/;
insert into events_test.events_smode_test values ('ee_16407_4','10-11-1956');
end|
select event_schema, event_name, sql_mode from information_schema.events order by event_schema, event_name;
@@ -104,20 +103,18 @@ select get_lock('ee_16407_2', 60);
get_lock('ee_16407_2', 60)
1
set global event_scheduler= 1;
-show processlist;
-Id User Host db Command Time State Info
-# root localhost events_test Query # NULL show processlist
-# event_scheduler localhost NULL Connect # Sleeping NULL
-# root localhost events_test Connect # User lock select get_lock('ee_16407_2', 60)
-# root localhost events_test Connect # User lock select get_lock('ee_16407_2', 60)
-# root localhost events_test Connect # User lock select get_lock('ee_16407_2', 60)
+select /*2*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
+user host db command state info
+event_scheduler localhost NULL Connect Sleeping NULL
+root localhost events_test Connect User lock select get_lock('ee_16407_2', 60) /*ee_16407_2*/
+root localhost events_test Connect User lock select get_lock('ee_16407_2', 60) /*ee_16407_3*/
+root localhost events_test Connect User lock select get_lock('ee_16407_2', 60) /*ee_16407_4*/
select release_lock('ee_16407_2');
release_lock('ee_16407_2')
1
-show processlist;
-Id User Host db Command Time State Info
-# root localhost events_test Query # NULL show processlist
-# event_scheduler localhost NULL Connect # Sleeping NULL
+select /*3*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
+user host db command state info
+event_scheduler localhost NULL Connect Sleeping NULL
set global event_scheduler= 0;
select * from events_smode_test order by ev_name, a;
ev_name a
@@ -140,12 +137,12 @@ create procedure ee_16407_5_pendant() be
create procedure ee_16407_6_pendant() begin insert into events_test.events_smode_test values('ee_16407_6','2004-02-29'); end|
create event ee_16407_5 on schedule every 60 second do
begin
-select get_lock('ee_16407_5', 60);
+select get_lock('ee_16407_5', 60) /*ee_16407_5*/;
call events_test.ee_16407_5_pendant();
end|
create event ee_16407_6 on schedule every 60 second do
begin
-select get_lock('ee_16407_5', 60);
+select get_lock('ee_16407_5', 60) /*ee_16407_6*/;
call events_test.ee_16407_6_pendant();
end|
set sql_mode='ansi';
@@ -153,19 +150,19 @@ select get_lock('ee_16407_5', 60);
get_lock('ee_16407_5', 60)
1
set global event_scheduler= 1;
-show processlist;
-Id User Host db Command Time State Info
-# root localhost events_test Query # NULL show processlist
-# event_scheduler localhost NULL Connect # Sleeping NULL
-# root localhost events_test Connect # User lock select get_lock('ee_16407_5', 60)
-# root localhost events_test Connect # User lock select get_lock('ee_16407_5', 60)
+"Should have 2 locked processes"
+select /*4*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
+user host db command state info
+event_scheduler localhost NULL Connect Sleeping NULL
+root localhost events_test Connect User lock select get_lock('ee_16407_5', 60) /*ee_16407_5*/
+root localhost events_test Connect User lock select get_lock('ee_16407_5', 60) /*ee_16407_6*/
select release_lock('ee_16407_5');
release_lock('ee_16407_5')
1
-show processlist;
-Id User Host db Command Time State Info
-# root localhost events_test Query # NULL show processlist
-# event_scheduler localhost NULL Connect # Sleeping NULL
+"Should have 0 processes locked"
+select /*5*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
+user host db command state info
+event_scheduler localhost NULL Connect Sleeping NULL
select * from events_smode_test order by ev_name, a;
ev_name a
ee_16407_6 2004-02-29
--- 1.5/mysql-test/t/events_bugs.test 2006-03-24 17:48:43 +01:00
+++ 1.6/mysql-test/t/events_bugs.test 2006-03-28 10:42:40 +02:00
@@ -77,8 +77,7 @@ end|
delimiter ;|
--sleep 1
--echo "Now if everything is fine the event has compiled and is locked
---replace_column 1 # 6 #
-show processlist;
+select /*1*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
select release_lock('test_bug16407');
set global event_scheduler= 0;
select event_schema, event_name, sql_mode from information_schema.events order by event_schema, event_name;
@@ -95,7 +94,7 @@ create table events_smode_test(ev_name c
delimiter |;
create event ee_16407_2 on schedule every 60 second do
begin
- select get_lock('ee_16407_2', 60);
+ select get_lock('ee_16407_2', 60) /*ee_16407_2*/;
insert into events_test.events_smode_test values('ee_16407_2','1980-19-02');
end|
--error ER_TRUNCATED_WRONG_VALUE
@@ -103,7 +102,7 @@ insert into events_smode_test values ('t
--echo "This is ok"
create event ee_16407_3 on schedule every 60 second do
begin
- select get_lock('ee_16407_2', 60);
+ select get_lock('ee_16407_2', 60) /*ee_16407_3*/;
insert into events_test.events_smode_test values ('ee_16407_3','1980-02-19');
insert into events_test.events_smode_test values ('ee_16407_3','1980-02-29');
end|
@@ -111,7 +110,7 @@ set sql_mode=""|
--echo "This will insert rows but they will be truncated"
create event ee_16407_4 on schedule every 60 second do
begin
- select get_lock('ee_16407_2', 60);
+ select get_lock('ee_16407_2', 60) /*ee_16407_4*/;
insert into events_test.events_smode_test values ('ee_16407_4','10-11-1956');
end|
delimiter ;|
@@ -120,12 +119,10 @@ set sql_mode="ansi";
select get_lock('ee_16407_2', 60);
set global event_scheduler= 1;
--sleep 1
---replace_column 1 # 6 #
-show processlist;
+select /*2*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
select release_lock('ee_16407_2');
--sleep 3
---replace_column 1 # 6 #
-show processlist;
+select /*3*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
set global event_scheduler= 0;
select * from events_smode_test order by ev_name, a;
--echo "OK, last check before we drop them"
@@ -143,12 +140,12 @@ create procedure ee_16407_5_pendant() be
create procedure ee_16407_6_pendant() begin insert into events_test.events_smode_test values('ee_16407_6','2004-02-29'); end|
create event ee_16407_5 on schedule every 60 second do
begin
- select get_lock('ee_16407_5', 60);
+ select get_lock('ee_16407_5', 60) /*ee_16407_5*/;
call events_test.ee_16407_5_pendant();
end|
create event ee_16407_6 on schedule every 60 second do
begin
- select get_lock('ee_16407_5', 60);
+ select get_lock('ee_16407_5', 60) /*ee_16407_6*/;
call events_test.ee_16407_6_pendant();
end|
delimiter ;|
@@ -156,12 +153,12 @@ set sql_mode='ansi';
select get_lock('ee_16407_5', 60);
set global event_scheduler= 1;
--sleep 1
---replace_column 1 # 6 #
-show processlist;
+--echo "Should have 2 locked processes"
+select /*4*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
select release_lock('ee_16407_5');
--sleep 3
---replace_column 1 # 6 #
-show processlist;
+--echo "Should have 0 processes locked"
+select /*5*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;
select * from events_smode_test order by ev_name, a;
--echo "And here we check one more time before we drop the events"
select event_schema, event_name, sql_mode from information_schema.events order by event_schema, event_name;
| Thread |
|---|
| • bk commit into 5.1 tree (andrey:1.2244) | ahristov | 28 Mar |
