Commit 3d2a3c41 authored by unknown's avatar unknown
Browse files

Merge lmy004.:/work/mysql-5.1-release 

into lmy004.:/work/mysql-5.1-release-17619-try3
parents c4c26017 6f1ab9ba

mysql-test/r/events_stress.result

+4 −4
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ CREATE EVENT ev_drop3 ON SCHEDULE EVERY 10 MINUTE DISABLE DO SELECT 1; 
USE events_test;

SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS;

COUNT(*)

203

103

SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';

COUNT(*)

3
@@ -29,7 +29,7 @@ CREATE DATABASE events_conn1_test2; 
USE events_conn1_test2;

SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';

COUNT(*)

100

50

SET GLOBAL event_scheduler=1;

DROP DATABASE events_conn1_test2;

SET GLOBAL event_scheduler=2;
@@ -41,14 +41,14 @@ USE events_conn1_test3; 
SET GLOBAL event_scheduler=1;

SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test3';

COUNT(*)

100

50

CREATE DATABASE events_conn1_test4;

USE events_conn1_test4;

CREATE DATABASE events_conn1_test2;

USE events_conn1_test2;

SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';

COUNT(*)

100

50

DROP DATABASE events_conn2_db;

DROP DATABASE events_conn3_db;

DROP DATABASE events_conn1_test2;

mysql-test/r/ps_1general.result

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ t9 MyISAM 10 Dynamic 2 216 432 # 2048 0 NULL # # # latin1_swedish_ci NULL 
prepare stmt4 from ' show status like ''Threads_running'' ';

execute stmt4;

Variable_name	Value

Threads_running	1

Threads_running	2

prepare stmt4 from ' show variables like ''sql_mode'' ';

execute stmt4;

Variable_name	Value

mysql-test/r/skip_name_resolve.result

+1 −0
Original line number Diff line number Diff line
@@ -10,5 +10,6 @@ user() 
#

show processlist;

Id	User	Host	db	Command	Time	State	Info

<id>	event_scheduler	<host>	NULL	<command>	<time>	<state>	<info>

<id>	root	<host>	test	<command>	<time>	<state>	<info>

<id>	root	<host>	test	<command>	<time>	<state>	<info>

mysql-test/r/sp_notembedded.result

+2 −0
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ show processlist; 
end|

call bug4902_2()|

Id	User	Host	db	Command	Time	State	Info

#	event_scheduler	localhost	NULL	Connect	#	Suspended	NULL

#	root	localhost	test	Query	#	NULL	show processlist

call bug4902_2()|

Id	User	Host	db	Command	Time	State	Info

#	event_scheduler	localhost	NULL	Connect	#	Suspended	NULL

#	root	localhost	test	Query	#	NULL	show processlist

drop procedure bug4902_2|

drop function if exists bug5278|

mysql-test/r/status.result

+5 −5
Original line number Diff line number Diff line
@@ -26,20 +26,20 @@ Last_query_cost 0.000000 
FLUSH STATUS;

SHOW STATUS LIKE 'max_used_connections';

Variable_name	Value

Max_used_connections	1

Max_used_connections	2

SET @save_thread_cache_size=@@thread_cache_size;

SET GLOBAL thread_cache_size=3;

SHOW STATUS LIKE 'max_used_connections';

Variable_name	Value

Max_used_connections	3

Max_used_connections	4

FLUSH STATUS;

SHOW STATUS LIKE 'max_used_connections';

Variable_name	Value

Max_used_connections	2

SHOW STATUS LIKE 'max_used_connections';

Variable_name	Value

Max_used_connections	3

SHOW STATUS LIKE 'max_used_connections';

Variable_name	Value

Max_used_connections	4

SHOW STATUS LIKE 'max_used_connections';

Variable_name	Value

Max_used_connections	5

SET GLOBAL thread_cache_size=@save_thread_cache_size;