diff options
| author | unknown <andrey@lmy004.> | 2006-05-23 12:10:07 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-05-23 12:10:07 +0200 |
| commit | 6f1ab9ba48c8980203e555f89691d461c637c524 (patch) | |
| tree | 1cd2e4e25e2079d9e282891450869de9406c5cf0 /mysql-test | |
| parent | da73495f09c1987e06426c80b2ea473ec7eda8e5 (diff) | |
| download | mariadb-git-6f1ab9ba48c8980203e555f89691d461c637c524.tar.gz | |
update result
drop users at the end of events_stress
mysql-test/r/ps_1general.result:
update result
mysql-test/r/skip_name_resolve.result:
update result
mysql-test/r/sp_notembedded.result:
update result
mysql-test/r/status.result:
update result
mysql-test/t/events_stress.test:
drop users created in the test
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ps_1general.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/skip_name_resolve.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/sp_notembedded.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/status.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/events_stress.test | 4 |
5 files changed, 13 insertions, 6 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index d0b773dfe34..1a1d6432411 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -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 diff --git a/mysql-test/r/skip_name_resolve.result b/mysql-test/r/skip_name_resolve.result index 8ef52e75238..855876825ad 100644 --- a/mysql-test/r/skip_name_resolve.result +++ b/mysql-test/r/skip_name_resolve.result @@ -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> diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result index c8cafe5ace1..c5d60446e0a 100644 --- a/mysql-test/r/sp_notembedded.result +++ b/mysql-test/r/sp_notembedded.result @@ -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| diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result index ca21b333a6a..e83ade78cf6 100644 --- a/mysql-test/r/status.result +++ b/mysql-test/r/status.result @@ -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; diff --git a/mysql-test/t/events_stress.test b/mysql-test/t/events_stress.test index ab6da98ba28..8d0034c232e 100644 --- a/mysql-test/t/events_stress.test +++ b/mysql-test/t/events_stress.test @@ -116,6 +116,10 @@ disconnect conn3; connection default; USE events_test; DROP TABLE fill_it; +--disable_query_log +DROP USER event_user2@localhost; +DROP USER event_user3@localhost; +--enable_query_log # # DROP DATABASE test end (bug #16406) # |