#At file:///work/bzr/mysql-5.1-serverqa/
2733 Horst Hunger 2009-02-03
for test purposes in 6.0-serverqa
modified:
mysql-test/r/status.result
mysql-test/suite/binlog/t/disabled.def
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl_ndb/t/disabled.def
mysql-test/t/disabled.def
mysql-test/t/status.test
=== modified file 'mysql-test/r/status.result'
--- a/mysql-test/r/status.result 2008-12-29 12:15:48 +0000
+++ b/mysql-test/r/status.result 2009-02-03 12:08:33 +0000
@@ -1,5 +1,7 @@
set @old_concurrent_insert= @@global.concurrent_insert;
set @@global.concurrent_insert= 0;
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
flush status;
show status like 'Table_lock%';
Variable_name Value
@@ -9,7 +11,7 @@ select * from information_schema.session
VARIABLE_NAME VARIABLE_VALUE
TABLE_LOCKS_IMMEDIATE 2
TABLE_LOCKS_WAITED 0
-# Switched to connection: con1
+connection con1;
set sql_log_bin=0;
set @old_general_log = @@global.general_log;
set global general_log = 'OFF';
@@ -19,21 +21,29 @@ insert into t1 values(1);
select 1;
1
1
-# Switched to connection: con2
+connection con2;
lock tables t1 read;
unlock tables;
lock tables t1 read;
-# Switched to connection: con1
+connection con1;
update t1 set n = 3;
-# Switched to connection: con2
+connection con2;
unlock tables;
-# Switched to connection: con1
+connection con1;
show status like 'Table_locks_waited';
Variable_name Value
Table_locks_waited 1
drop table t1;
set global general_log = @old_general_log;
-# Switched to connection: default
+connection default;
+disconnect con2;
+select 1;
+1
+1
+disconnect con1;
+select 1;
+1
+1
select 1;
1
1
@@ -75,6 +85,13 @@ VARIABLE_NAME VARIABLE_VALUE
MAX_USED_CONNECTIONS 1
SET @save_thread_cache_size=@@thread_cache_size;
SET GLOBAL thread_cache_size=3;
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+connection con1;
+disconnect con2;
+select 1;
+1
+1
SHOW STATUS LIKE 'max_used_connections';
Variable_name Value
Max_used_connections 3
@@ -88,19 +105,34 @@ Max_used_connections 2
SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'max_used_connections';
VARIABLE_NAME VARIABLE_VALUE
MAX_USED_CONNECTIONS 2
+connect (con2,localhost,root,,);
SHOW STATUS LIKE 'max_used_connections';
Variable_name Value
Max_used_connections 3
SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'max_used_connections';
VARIABLE_NAME VARIABLE_VALUE
MAX_USED_CONNECTIONS 3
+connect (con3,localhost,root,,);
SHOW STATUS LIKE 'max_used_connections';
Variable_name Value
Max_used_connections 4
SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'max_used_connections';
VARIABLE_NAME VARIABLE_VALUE
MAX_USED_CONNECTIONS 4
+connection default;
SET GLOBAL thread_cache_size=@save_thread_cache_size;
+disconnect con3;
+select 1;
+1
+1
+disconnect con2;
+select 1;
+1
+1
+disconnect con1;
+select 1;
+1
+1
CREATE TABLE t1 ( a INT );
INSERT INTO t1 VALUES (1), (2);
SELECT a FROM t1 LIMIT 1;
@@ -149,6 +181,7 @@ SHOW SESSION STATUS LIKE 'Last_query_cos
Variable_name Value
Last_query_cost 4.805836
DROP TABLE t1;
+connect (con1,localhost,root,,);
show status like 'com_show_status';
Variable_name Value
Com_show_status 3
@@ -173,6 +206,11 @@ Variable_name Value
Com_show_status 8
rnd_diff tmp_table_diff
20 8
+connection default;
+disconnect con1;
+select 1;
+1
+1
flush status;
show status like 'Com%function';
Variable_name Value
@@ -191,6 +229,8 @@ Variable_name Value
Com_alter_function 0
Com_create_function 1
Com_drop_function 1
+connect (root, localhost, root,,test);
+connection root;
create database db37908;
create table db37908.t1(f1 int);
insert into db37908.t1 values(1);
@@ -198,6 +238,8 @@ grant usage,execute on test.* to mysqlte
create procedure proc37908() begin select 1; end |
create function func37908() returns int sql security invoker
return (select * from db37908.t1 limit 1)|
+connect (user1,localhost,mysqltest_1,,test);
+connection user1;
select * from db37908.t1;
ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
show status where variable_name ='uptime' and 2 in (select * from db37908.t1);
@@ -206,9 +248,22 @@ show procedure status where name ='proc3
ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
show function status where name ='func37908' and 1 in (select func37908());
ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
+connection default;
+disaconnect user1;
+select 1;
+1
+1
+disconnect root;
+select 1;
+1
+1
drop database db37908;
drop procedure proc37908;
drop function func37908;
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
+DROP USER mysqltest_1@localhost;
+connect (con1,localhost,root,,);
+connection con1;
DROP PROCEDURE IF EXISTS p1;
DROP FUNCTION IF EXISTS f1;
CREATE FUNCTION f1() RETURNS INTEGER
@@ -229,9 +284,26 @@ f1()
CALL p1();
1
1
-SELECT 9;
-9
-9
+SELECT 9 >= 9;
+9 >= 9
+1
+connection default;
+disconnect con1;
+SELECT 1;
+1
+1
DROP PROCEDURE p1;
DROP FUNCTION f1;
+DROP VIEW IF EXISTS v1;
+CREATE VIEW v1 AS SELECT VARIABLE_NAME AS NAME, CONVERT(VARIABLE_VALUE, UNSIGNED) AS VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
+SELECT VALUE INTO @tc FROM v1 WHERE NAME = 'Threads_connected';
+SELECT NAME FROM v1 WHERE NAME = 'Threads_created' AND VALUE < @tc;
+NAME
+DROP VIEW v1;
+SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+WHERE VARIABLE_NAME = 'Threads_created' AND
+CONVERT(VARIABLE_VALUE, UNSIGNED) > 0;
+VARIABLE_NAME
+THREADS_CREATED
+connection default;
set @@global.concurrent_insert= @old_concurrent_insert;
=== modified file 'mysql-test/suite/binlog/t/disabled.def'
--- a/mysql-test/suite/binlog/t/disabled.def 2008-02-28 21:50:15 +0000
+++ b/mysql-test/suite/binlog/t/disabled.def 2009-02-03 12:08:33 +0000
@@ -1,11 +1,31 @@
-##############################################################################
-#
-# List the test cases that are to be disabled temporarily.
-#
-# Separate the test case name and the comment with ':'.
-#
-# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
-#
-# Do not use any TAB characters for whitespace.
-#
-##############################################################################
+binlog_auto_increment_bug33029 : ALL tests
+binlog_base64_flag : ALL tests
+binlog_database : ALL tests
+binlog_grant : ALL tests
+binlog_innodb_row : ALL tests
+binlog_innodb : ALL tests
+binlog_killed_simulate : ALL tests
+binlog_killed : ALL tests
+binlog_mix_innodb_stat : ALL tests
+binlog_multi_engine : ALL tests
+binlog_old_versions : ALL tests
+binlog_row_binlog : ALL tests
+binlog_row_ctype_cp932 : ALL tests
+binlog_row_ctype_ucs : ALL tests
+binlog_row_drop_tmp_tbl : ALL tests
+binlog_row_innodb_stat : ALL tests
+binlog_row_insert_select : ALL tests
+binlog_row_mix_innodb_myisam : ALL tests
+binlog_start_comment : ALL tests
+binlog_statement_insert_delayed : ALL tests
+binlog_stm_binlog : ALL tests
+binlog_stm_blackhole : ALL tests
+binlog_stm_ctype_cp932 : ALL tests
+binlog_stm_ctype_ucs : ALL tests
+binlog_stm_drop_tmp_tbl : ALL tests
+binlog_stm_innodb_stat : ALL tests
+binlog_stm_insert_select : ALL tests
+binlog_stm_mix_innodb_myisam : ALL tests
+binlog_stm_ps : ALL tests
+binlog_stm_row : ALL tests
+binlog_unsafe : ALL tests
=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def 2008-12-08 14:36:42 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def 2009-02-03 12:08:33 +0000
@@ -1,15 +1,76 @@
-##############################################################################
-#
-# List the test cases that are to be disabled temporarily.
-#
-# Separate the test case name and the comment with ':'.
-#
-# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
-#
-# Do not use any TAB characters for whitespace.
-#
-##############################################################################
-
-ndb_partition_error2 : Bug#40989 ndb_partition_error2 needs maintenance
-
-# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
+loaddata_autocom_ndb : All
+ndb_alter_table2 : All
+ndb_alter_table3 : All
+ndb_alter_table : All
+ndbapi : All
+ndb_auto_increment : All
+ndb_autoinc : All
+ndb_basic : All
+ndb_binlog_basic : All
+ndb_binlog_ddl_multi : All
+ndb_binlog_discover : All
+ndb_binlog_format : All
+ndb_binlog_ignore_db : All
+ndb_binlog_log_bin : All
+ndb_binlog_multi : All
+ndb_bitfield : All
+ndb_blob_partition : All
+ndb_blob : All
+ndb_bug26793 : All
+ndb_bug31477 : All
+ndb_cache2 : All
+ndb_cache_multi2 : All
+ndb_cache_multi : All
+ndb_cache : All
+ndb_charset : All
+ndb_condition_pushdown : All
+ndb_config2 : All
+ndb_config : All
+ndb_cursor : All
+ndb_database : All
+ndb_dd_alter : All
+ndb_dd_basic : All
+ndb_dd_ddl : All
+ndb_dd_disk2memory : All
+ndb_dd_dump : All
+ndb_dd_sql_features : All
+ndb_gis : All
+ndb_index_ordered : All
+ndb_index : All
+ndb_index_unique : All
+ndb_insert : All
+ndb_limit : All
+ndb_loaddatalocal : All
+ndb_load : All
+ndb_lock_table : All
+ndb_lock : All
+ndb_minmax : All
+ndb_multi_row : All
+ndb_multi : All
+ndb_partition_error2 : All
+ndb_partition_error : All
+ndb_partition_key : All
+ndb_partition_list : All
+ndb_partition_range : All
+ndb_read_multi_range : All
+ndb_rename : All
+ndb_replace : All
+ndb_restore_compat : All
+ndb_restore_different_endian_data : All
+ndb_restore_partition : All
+ndb_restore_print : All
+ndb_restore : All
+ndb_row_format : All
+ndb_single_user : All
+ndb_sp : All
+ndb_subquery : All
+ndb_temporary : All
+ndb_transaction : All
+ndb_trigger : All
+ndb_truncate : All
+ndb_types : All
+ndb_update_no_read : All
+ndb_update : All
+ndb_view : All
+ps_7ndb : All
+strict_autoinc_5ndb : All
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def 2008-12-30 08:48:19 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def 2009-02-03 12:08:33 +0000
@@ -1,13 +1,200 @@
-##############################################################################
-#
-# List the test cases that are to be disabled temporarily.
-#
-# Separate the test case name and the comment with ':'.
-#
-# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
-#
-# Do not use any TAB characters for whitespace.
-#
-##############################################################################
-
-rpl_binlog_corruption : BUG#41793 2008-12-30 sven rpl_binlog_corruption disabled in main (needs new mtr)
+rpl000010 : All
+rpl000011 : All
+rpl000013 : All
+rpl_000015 : All
+rpl000017 : All
+rpl_alter_db : All
+rpl_alter : All
+rpl_auto_increment_11932 : All
+rpl_auto_increment : All
+rpl_binlog_corruption : All
+rpl_binlog_grant : All
+rpl_binlog_query_filter_rules : All
+rpl_bit_npk : All
+rpl_bit : All
+rpl_blackhole : All
+rpl_bug31076 : All
+rpl_bug33931 : All
+rpl_change_master : All
+rpl_charset_sjis : All
+rpl_charset : All
+rpl_colSize : All
+rpl_commit_after_flush : All
+rpl_create_database : All
+rpl_critical_errors : All
+rpl_ddl : All
+rpl_deadlock_innodb : All
+rpl_delete_no_where : All
+rpl_do_grant : All
+rpl_drop_db : All
+rpl_drop_temp : All
+rpl_drop : All
+rpl_drop_view : All
+rpl_dual_pos_advance : All
+rpl_EE_err : All
+rpl_empty_master_crash : All
+rpl_err_ignoredtable : All
+rpl_events : All
+rpl_extraCol_innodb : All
+rpl_extraColmaster_innodb : All
+rpl_extraColmaster_myisam : All
+rpl_extraCol_myisam : All
+rpl_failed_optimize : All
+rpl_filter_tables_not_exist : All
+rpl_flushlog_loop : All
+rpl_foreign_key_innodb : All
+rpl_found_rows : All
+rpl_free_items : All
+rpl_get_lock : All
+rpl_grant : All
+rpl_idempotency : All
+rpl_ignore_grant : All
+rpl_ignore_revoke : All
+rpl_ignore_table : All
+rpl_ignore_table_update : All
+rpl_incident : All
+rpl_init_slave : All
+rpl_innodb_bug28430 : All
+rpl_innodb_bug30888 : All
+rpl_innodb_bug30919 : All
+rpl_innodb_mixed_ddl : All
+rpl_innodb_mixed_dml : All
+rpl_innodb : All
+rpl_insert_id_pk : All
+rpl_insert_id : All
+rpl_insert_ignore : All
+rpl_insert_select : All
+rpl_insert : All
+rpl_invoked_features : All
+rpl_known_bugs_detection : All
+rpl_LD_INFILE : All
+rpl_loaddata_charset : All
+rpl_loaddata_fatal : All
+rpl_loaddatalocal : All
+rpl_loaddata_map : All
+rpl_loaddata_m : All
+rpl_loaddata_simple : All
+rpl_loaddata_s : All
+rpl_loaddata : All
+rpl_loadfile : All
+rpl_load_from_master : All
+rpl_load_table_from_master : All
+rpl_locale : All
+rpl_log_pos : All
+rpl_many_optimize : All
+rpl_master_pos_wait : All
+rpl_misc_functions : All
+rpl_mixed_ddl_dml : All
+rpl_multi_delete2 : All
+rpl_multi_delete : All
+rpl_multi_engine : All
+rpl_multi_update2 : All
+rpl_multi_update3 : All
+rpl_multi_update4 : All
+rpl_multi_update : All
+rpl_optimize : All
+rpl_packet : All
+rpl_plugin_load : All
+rpl_ps : All
+rpl_rbr_to_sbr : All
+rpl_read_only : All
+rpl_relayrotate : All
+rpl_relay_space_innodb : All
+rpl_relay_space_myisam : All
+rpl_relayspace : All
+rpl_replicate_do : All
+rpl_replicate_ignore_db : All
+rpl_report : All
+rpl_rewrt_db : All
+rpl_rotate_logs : All
+rpl_row_001 : All
+rpl_row_4_bytes : All
+rpl_row_basic_11bugs : All
+rpl_row_basic_2myisam : All
+rpl_row_basic_3innodb : All
+rpl_row_basic_8partition : All
+rpl_row_blob_innodb : All
+rpl_row_blob_myisam : All
+rpl_row_colSize : All
+rpl_row_create_table : All
+rpl_row_delayed_ins : All
+rpl_row_drop : All
+rpl_row_flsh_tbls : All
+rpl_row_func001 : All
+rpl_row_func002 : All
+rpl_row_func003 : All
+rpl_row_inexist_tbl : All
+rpl_row_insert_delayed : All
+rpl_row_log_innodb : All
+rpl_row_log : All
+rpl_row_max_relay_size : All
+rpl_row_mysqlbinlog : All
+rpl_row_mystery22 : All
+rpl_row_NOW : All
+rpl_row_reset_slave : All
+rpl_row_sp001 : All
+rpl_row_sp002_innodb : All
+rpl_row_sp003 : All
+rpl_row_sp005 : All
+rpl_row_sp006_InnoDB : All
+rpl_row_sp007_innodb : All
+rpl_row_sp008 : All
+rpl_row_sp009 : All
+rpl_row_sp010 : All
+rpl_row_sp011 : All
+rpl_row_sp012 : All
+rpl_row_stop_middle_update : All
+rpl_row_tabledefs_2myisam : All
+rpl_row_tabledefs_3innodb : All
+rpl_row_trig001 : All
+rpl_row_trig002 : All
+rpl_row_trig003 : All
+rpl_row_trig004 : All
+rpl_row_unsafe_funcs : All
+rpl_row_until : All
+rpl_row_USER : All
+rpl_row_UUID : All
+rpl_row_view01 : All
+rpl_server_id1 : All
+rpl_server_id2 : All
+rpl_server_id : All
+rpl_session_var : All
+rpl_set_charset : All
+rpl_sf : All
+rpl_skip_error : All
+rpl_slave_skip : All
+rpl_slave_status : All
+rpl_sp004 : All
+rpl_sp_effects : All
+rpl_sporadic_master : All
+rpl_sp : All
+rpl_ssl1 : All
+rpl_ssl : All
+rpl_start_stop_slave : All
+rpl_stm_000001 : All
+rpl_stm_auto_increment_bug33029 : All
+rpl_stm_EE_err2 : All
+rpl_stm_flsh_tbls : All
+rpl_stm_insert_delayed : All
+rpl_stm_log : All
+rpl_stm_max_relay_size : All
+rpl_stm_multi_query : All
+rpl_stm_mystery22 : All
+rpl_stm_no_op : All
+rpl_stm_reset_slave : All
+rpl_stm_until : All
+rpl_switch_stm_row_mixed : All
+rpl_temporary_errors : All
+rpl_temporary : All
+rpl_temp_table : All
+rpl_timezone : All
+rpl_trigger : All
+rpl_truncate_2myisam : All
+rpl_truncate_3innodb : All
+rpl_trunc_temp : All
+rpl_udf : All
+rpl_user : All
+rpl_user_variables : All
+rpl_variables_stm : All
+rpl_variables : All
+rpl_view : All
=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def 2008-12-08 14:36:42 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def 2009-02-03 12:08:33 +0000
@@ -1,16 +1,46 @@
-##############################################################################
-#
-# List the test cases that are to be disabled temporarily.
-#
-# Separate the test case name and the comment with ':'.
-#
-# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
-#
-# Do not use any TAB characters for whitespace.
-#
-##############################################################################
-
-rpl_ndb_circular : Bug#41183 rpl_ndb_circular, rpl_ndb_circular_simplex need maintenance, crash
-rpl_ndb_circular_simplex : Bug#41183 rpl_ndb_circular, rpl_ndb_circular_simplex need maintenance, crash
-
-# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
+rpl_ndb_2innodb : All
+rpl_ndb_2myisam : All
+rpl_ndb_2ndb : All
+rpl_ndb_2other : All
+rpl_ndbapi_multi : All
+rpl_ndb_apply_status : All
+rpl_ndb_auto_inc : All
+rpl_ndb_bank : All
+rpl_ndb_basic : All
+rpl_ndb_blob2 : All
+rpl_ndb_blob : All
+rpl_ndb_circular_simplex : All
+rpl_ndb_circular : All
+rpl_ndb_commit_afterflush : All
+rpl_ndb_ctype_ucs2_def : All
+rpl_ndb_dd_basic : All
+rpl_ndb_ddl : All
+rpl_ndb_dd_partitions : All
+rpl_ndb_delete_nowhere : All
+rpl_ndb_do_db : All
+rpl_ndb_do_table : All
+rpl_ndb_extraCol : All
+rpl_ndb_func003 : All
+rpl_ndb_idempotent : All
+rpl_ndb_innodb2ndb : All
+rpl_ndb_innodb_trans : All
+rpl_ndb_insert_ignore : All
+rpl_ndb_load : All
+rpl_ndb_log : All
+rpl_ndb_multi : All
+rpl_ndb_multi_update2 : All
+rpl_ndb_multi_update3 : All
+rpl_ndb_myisam2ndb : All
+rpl_ndb_relayrotate : All
+rpl_ndb_rep_ignore : All
+rpl_ndb_row_001 : All
+rpl_ndb_sp003 : All
+rpl_ndb_sp006 : All
+rpl_ndb_stm_innodb : All
+rpl_ndb_sync : All
+rpl_ndb_transaction : All
+rpl_ndb_trig004 : All
+rpl_ndb_UUID : All
+rpl_row_basic_7ndb : All
+rpl_truncate_7ndb_2 : All
+rpl_truncate_7ndb : All
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def 2008-12-18 18:28:44 +0000
+++ b/mysql-test/t/disabled.def 2009-02-03 12:08:33 +0000
@@ -1,16 +1,476 @@
-##############################################################################
-#
-# List the test cases that are to be disabled temporarily.
-#
-# Separate the test case name and the comment with ':'.
-#
-# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
-#
-# Do not use any TAB characters for whitespace.
-#
-##############################################################################
-federated_transactions : Bug#29523 Transactions do not work
-slow_query_log_func : Bug #37962: *_func tests containing sleeps/race conditions
-wait_timeout_func : Bug #41225 joro wait_timeout_func fails
-kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
-query_cache_28249 : Bug#41098 Query Cache returns wrong result with concurrent insert
+1st : All
+alias : All
+almost_full : All
+alter_table-big : All
+alter_table : All
+analyse : All
+analyze : All
+ansi : All
+archive-big : All
+archive_bitfield : All
+archive_gis : All
+archive : All
+auto_increment : All
+backup : All
+bench_count_distinct : All
+bigint : All
+binary : All
+binlog_index : All
+bool : All
+bootstrap : All
+bulk_replace : All
+cache_innodb : All
+case : All
+cast : All
+change_user : All
+check : All
+client_xml : All
+comments : All
+commit_1innodb : All
+compare : All
+compress : All
+concurrent_innodb_safelog : All
+concurrent_innodb_unsafelog : All
+connect : All
+consistent_snapshot : All
+constraints : All
+contributors : All
+count_distinct2 : All
+count_distinct3 : All
+count_distinct : All
+crash_commit_before : All
+create-big : All
+create_not_windows : All
+create_select_tmp : All
+create : All
+csv_alter_table : All
+csv_not_null : All
+csv : All
+ctype_ascii : All
+ctype_big5 : All
+ctype_collate : All
+ctype_cp1250_ch : All
+ctype_cp1251 : All
+ctype_cp932_binlog_row : All
+ctype_cp932_binlog_stm : All
+ctype_create : All
+ctype_eucjpms : All
+ctype_euckr : All
+ctype_filename : All
+ctype_filesystem : All
+ctype_gb2312 : All
+ctype_gbk : All
+ctype_hebrew : All
+ctype_latin1_de : All
+ctype_latin1 : All
+ctype_latin2_ch : All
+ctype_latin2 : All
+ctype_ldml : All
+ctype_many : All
+ctype_mb : All
+ctype_recoding : All
+ctype_sjis : All
+ctype_tis620 : All
+ctype_uca : All
+ctype_ucs2_def : All
+ctype_ucs : All
+ctype_ujis : All
+ctype_ujis_ucs2 : All
+ctype_utf8 : All
+date_formats : All
+ddl_i18n_koi8r : All
+ddl_i18n_utf8 : All
+deadlock_innodb : All
+default : All
+delayed : All
+delete : All
+derived : All
+dirty_close : All
+distinct : All
+drop : All
+empty_table : All
+endspace : All
+error_simulation : All
+errors : All
+events_1 : All
+events_2 : All
+events_bugs : All
+events_embedded : All
+events_grant : All
+events_logs : Alls.test
+events_microsec : All
+events_restart_phase1 : All
+events_restart_phase2 : All
+events_restart_phase3 : All
+events_scheduling : All
+events_stress : All
+events_time_zone : All
+events_trans_notembedded : All
+events_trans : All
+exampledb : All
+execution_constants : All
+explain : All
+federated_archive : All
+federated_bug_13118 : All
+federated_bug_25714 : All
+federated_innodb : All
+federated_server : All
+federated : All
+federated_transactions : All
+fix_priv_tables : All
+flush2 : All
+flush_block_commit_notembedded : All
+flush_block_commit : All
+flush_read_lock_kill : All
+flush_table : All
+flush : All
+foreign_key : All
+fulltext2 : All
+fulltext3 : All
+fulltext_cache : All
+fulltext_distinct : All
+fulltext_left_join : All
+fulltext_multi : All
+fulltext_order_by : All
+fulltext_plugin : All
+fulltext : All
+fulltext_update : All
+fulltext_var : All
+func_compress : All
+func_concat : All
+func_crypt : All
+func_date_add : All
+func_default : All
+func_des_encrypt : All
+func_encrypt_nossl : All
+func_encrypt : All
+func_equal : All
+func_gconcat : All
+func_group_innodb : All
+func_group : All
+func_if : All
+func_in : All
+func_isnull : All
+func_like : All
+func_math : All
+func_misc : All
+func_op : All
+func_regexp : All
+func_rollback : All
+func_sapdb : All
+func_set : All
+func_str : All
+func_system : All
+func : All.test
+func_timestamp : All
+func_time : All
+gcc296 : All
+gis-rtree : All
+gis : All
+grant2 : All
+grant3 : All
+grant_cache_no_prot : All
+grant_cache_ps_prot : All
+grant : All
+greedy_optimizer : All
+group_by : All
+group_min_max_innodb : All
+group_min_max : All
+handler_innodb : All
+handler_myisam : All
+having : All
+heap_auto_increment : All
+heap_btree : All
+heap_hash : All
+heap : All
+help : All
+index_merge_innodb : All
+index_merge_myisam : All
+information_schema_chmod : All
+information_schema_db : All
+information_schema_inno : All
+information_schema_part : All
+information_schema : All
+init_connect : All
+init_file : All
+innodb_autoinc_lock_mode_zero : All
+innodb-autoinc-optimize : All
+innodb-autoinc : All
+innodb_bug34053 : All
+innodb_bug34300 : All
+innodb_bug35220 : All
+innodb_bug38231 : All
+innodb_bug39438 : All
+innodb_gis : All
+innodb-lock : All
+innodb_mysql_rbk : All
+innodb_mysql : All
+innodb_notembedded : All
+innodb-replace : All
+innodb-semi-consistent : All
+innodb : All
+innodb_timeout_rollback : All
+innodb_trx_weight : All
+innodb-ucs2 : All
+insert_notembedded : All
+insert_select : All
+insert : All
+insert_update : All
+join_crash : All
+join_nested : All
+join_outer_innodb : All
+join_outer : All
+join : All
+key_cache : All
+key_diff : All
+key_primary : All
+key : All
+keywords : All
+kill : All
+limit : All
+loaddata_autocom_innodb : All
+loaddata : All
+lock_multi : All
+lock_tables_lost_commit : All
+lock : All
+log_state : All
+log_tables-big : All
+log_tables : All
+long_tmpdir : All
+lowercase_fs_off : All
+lowercase_mixed_tmpdir : All
+lowercase_table2 : All
+lowercase_table3 : All
+lowercase_table_grant : All
+lowercase_table_qcache : All
+lowercase_table : All
+lowercase_view : All
+merge-big : All
+merge_innodb : All
+merge : All
+metadata : All
+mix2_myisam : All
+mix2_myisam_ucs2 : All
+multi_statement : All
+multi_update2 : All
+multi_update : All
+multi_update_tiny_hash : All
+myisam-blob : All
+myisampack : All
+myisam-system : All
+myisam : All
+mysqladmin : All
+mysqlbinlog2 : All
+mysqlbinlog_base64 : All
+mysqlbinlog-cp932 : All
+mysqlbinlog_row_big : All
+mysqlbinlog_row_innodb : All
+mysqlbinlog_row_myisam : All
+mysqlbinlog_row : All
+mysqlbinlog_row_trans : All
+mysqlbinlog : All
+mysqlcheck : All
+mysql_client : All.test
+mysql_comments : All
+mysql_cp932 : All
+mysqldump-compat : All
+mysqldump-max : All
+mysqldump-no-binlog : All
+mysqldump : All
+mysql_protocols : All
+mysqlshow : All
+mysqlslap : All
+mysql : All
+mysq : All.test
+mysql_upgrade : All
+named_pipe : All
+negation_elimination : All
+not_embedded_server : All
+no-threads : All
+not_partition : All
+null_key : All
+null : All
+odbc : All
+olap : All
+openssl_1 : All
+order_by : All
+order_fill_sortbuf : All
+outfile_loaddata : All
+outfile : All
+overflow : All
+packet : All
+parser_bug21114_innodb : All
+parser_precedence : All
+parser_stack : All
+parser : All
+partition_archive : All
+partition_blackhole : All
+partition_bug18198 : All
+partition_charset : All
+partition_csv : All
+partition_datatype : All
+partition_error : All
+partition_federated : All
+partition_grant : All
+partition_hash : All
+partition_innodb_semi_consistent : All
+partition_innodb_stmt : All
+partition_innodb : All
+partition_list : All
+partition_mgm_err2 : All
+partition_mgm_err : All
+partition_mgm : All
+partition_not_windows : All
+partition_order : All
+partition_pruning : All
+partition_range : All
+partition_symlink : All
+partition : All
+partition_windows : All
+perror : All
+perror-win : All
+plugin_load : All
+plugin : All
+preload : All
+profiling : All
+ps_10nestset : All
+ps_11bugs : All
+ps_1general : All
+ps_2myisam : All
+ps_3innodb : All
+ps_4heap : All
+ps_5merge : All
+ps_ddl1 : All
+ps_ddl : All
+ps_grant : All
+ps_not_windows : All
+ps : All
+query_cache_28249 : All
+query_cache_debug : All
+query_cache_merge : All
+query_cache_notembedded : All
+query_cache_ps_no_prot : All
+query_cache_ps_ps_prot : All
+query_cache : All
+query_cache_with_views : All
+range : All
+read_many_rows_innodb : All
+read_only_innodb : All
+read_only : All
+renamedb : All
+rename : All
+repair : All
+replace : All
+rollback : All
+round : All
+rowid_order_innodb : All
+row : All
+schema : All
+select_found : All
+select_safe : All
+select : All
+shm : All
+show_check : All
+skip_grants : All
+skip_log_bin : All
+skip_name_resolve : All
+sp-big : All
+sp-code : All
+sp-destruct : All
+sp-dynamic : All
+sp-error : All
+sp_gis : All
+sp_notembedded : All
+sp-prelocking : All
+sp-security : All
+sp_stress_case : All
+sp : All
+sp-threads : All
+sp_trans_log : All
+sp_trans : All
+sp-ucs2 : All
+sp-vars : All
+sql_mode : All
+ssl_8k_key : All
+ssl-big : All
+ssl_compress : All
+ssl_connect : All
+ssl : All
+status2 : All
+;status : All
+strict_autoinc_1myisam : All
+strict_autoinc_2innodb : All
+strict_autoinc_3heap : All
+strict : All
+subselect2 : All
+subselect3 : All
+subselect_debug : All
+subselect_gis : All
+subselect_innodb : All
+subselect_notembedded : All
+subselect : All
+sum_distinct-big : All
+sum_distinct : All
+symlink : All
+synchronization : All
+sysdate_is_now : All
+system_mysql_db_fix30020 : All
+system_mysql_db_fix40123 : All
+system_mysql_db_fix50030 : All
+system_mysql_db_fix50117 : All
+system_mysql_db_refs : All
+system_mysql_db : All
+tablelock : All
+temp_table : All
+timezone2 : All
+timezone3 : All
+timezone4 : All
+timezone_grant : All
+timezone : All
+trigger-compat : All
+trigger_notembedded : All
+trigger : All
+trigger-trans : All
+truncate : All
+type_binary : All
+type_bit_innodb : All
+type_bit : All
+type_blob : All
+type_date : All
+type_datetime : All
+type_decimal : All
+type_enum : All
+type_float : All
+type_nchar : All
+type_newdecimal-big : All
+type_newdecimal : All
+type_ranges : All
+type_set : All
+type_timestamp : All
+type_time : All
+type_uint : All
+type_varchar : All
+type_year : All
+udf_skip_grants : All
+udf : All
+union : All
+unsafe_binlog_innodb : All
+update : All
+upgrade : All
+user_limits : All
+user_var-binlog : All
+user_var : All
+varbinary : All
+variables-big : All
+variables+c : All
+variables_debug : All
+variables-notembedded : All
+variables : All
+view_grant : All
+view : All
+wait_timeout : All
+warnings_engine_disabled : All
+warnings : All
+windows : All
+xa : All
+xml : All
=== modified file 'mysql-test/t/status.test'
--- a/mysql-test/t/status.test 2008-12-29 12:15:48 +0000
+++ b/mysql-test/t/status.test 2009-02-03 12:08:33 +0000
@@ -12,7 +12,9 @@ set @@global.concurrent_insert= 0;
# PS causes different statistics
--disable_ps_protocol
+--echo connect (con1,localhost,root,,);
connect (con1,localhost,root,,);
+--echo connect (con2,localhost,root,,);
connect (con2,localhost,root,,);
flush status;
@@ -20,8 +22,8 @@ flush status;
show status like 'Table_lock%';
select * from information_schema.session_status where variable_name like 'Table_lock%';
+--echo connection con1;
connection con1;
---echo # Switched to connection: con1
set sql_log_bin=0;
set @old_general_log = @@global.general_log;
set global general_log = 'OFF';
@@ -35,35 +37,39 @@ insert into t1 values(1);
# previous statement are unlocked and closed.
select 1;
+--echo connection con2;
connection con2;
---echo # Switched to connection: con2
lock tables t1 read;
unlock tables;
lock tables t1 read;
+--echo connection con1;
connection con1;
---echo # Switched to connection: con1
let $ID= `select connection_id()`;
--send update t1 set n = 3
+--echo connection con2;
connection con2;
---echo # Switched to 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";
--source include/wait_condition.inc
unlock tables;
+--echo connection con1;
connection con1;
---echo # Switched to connection: con1
reap;
show status like 'Table_locks_waited';
drop table t1;
set global general_log = @old_general_log;
+--echo connection default;
+connection default;
+--echo disconnect con2;
disconnect con2;
+select 1;
+--echo disconnect con1;
disconnect con1;
-connection default;
---echo # Switched to connection: default
+select 1;
# End of 4.1 tests
@@ -103,7 +109,7 @@ drop table t1;
#
# Wait for at most $disconnect_timeout seconds for disconnects to finish.
-let $disconnect_timeout = 10;
+let $disconnect_timeout = 30;
# Wait for any previous disconnects to finish.
FLUSH STATUS;
@@ -133,11 +139,16 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION
SET @save_thread_cache_size=@@thread_cache_size;
SET GLOBAL thread_cache_size=3;
+--echo connect (con1,localhost,root,,);
connect (con1,localhost,root,,);
+--echo connect (con2,localhost,root,,);
connect (con2,localhost,root,,);
+--echo connection con1;
connection con1;
+--echo disconnect con2;
disconnect con2;
+select 1;
# Check that max_used_connections still reflects maximum value.
SHOW STATUS LIKE 'max_used_connections';
@@ -169,22 +180,31 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION
# Check that max_used_connections is updated when cached thread is
# reused...
+--echo connect (con2,localhost,root,,);
connect (con2,localhost,root,,);
SHOW STATUS LIKE 'max_used_connections';
SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'max_used_connections';
# ...and when new thread is created.
+--echo connect (con3,localhost,root,,);
connect (con3,localhost,root,,);
SHOW STATUS LIKE 'max_used_connections';
SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME LIKE 'max_used_connections';
# Restore original setting.
+--echo connection default;
connection default;
SET GLOBAL thread_cache_size=@save_thread_cache_size;
+--echo disconnect con3;
disconnect con3;
+select 1;
+--echo disconnect con2;
disconnect con2;
+select 1;
+--echo disconnect con1;
disconnect con1;
+select 1;
#
@@ -224,6 +244,7 @@ DROP TABLE t1;
# Ensure that SHOW STATUS only changes global status variables
#
+--echo connect (con1,localhost,root,,);
connect (con1,localhost,root,,);
let $rnd_next = `show global status like 'handler_read_rnd_next'`;
let $tmp_table = `show global status like 'Created_tmp_tables'`;
@@ -238,9 +259,11 @@ let $tmp_table2 = `show global status li
--disable_query_log
eval select substring_index('$rnd_next2',0x9,-1)-substring_index('$rnd_next',0x9,-1) as rnd_diff, substring_index('$tmp_table2',0x9,-1)-substring_index('$tmp_table',0x9,-1) as tmp_table_diff;
--enable_query_log
-disconnect con1;
+--echo connection default;
connection default;
-
+--echo disconnect con1;
+disconnect con1;
+select 1;
#
# Bug#30252 Com_create_function is not incremented.
#
@@ -257,13 +280,14 @@ create function f1 (x INTEGER) returns i
DELIMITER ;//
drop function f1;
-
show status like 'Com%function';
#
# Bug#37908: Skipped access right check caused server crash.
#
+--echo connect (root, localhost, root,,test);
connect (root, localhost, root,,test);
+--echo connection root;
connection root;
--disable_warnings
create database db37908;
@@ -277,7 +301,9 @@ create function func37908() returns int
return (select * from db37908.t1 limit 1)|
delimiter ;|
+--echo connect (user1,localhost,mysqltest_1,,test);
connect (user1,localhost,mysqltest_1,,test);
+--echo connection user1;
connection user1;
--error 1142
@@ -289,15 +315,26 @@ show procedure status where name ='proc3
--error 1142
show function status where name ='func37908' and 1 in (select func37908());
-connection root;
+--echo connection default;
+connection default;
+--echo disaconnect user1;
+disconnect user1;
+select 1;
+--echo disconnect root;
+disconnect root;
+select 1;
drop database db37908;
drop procedure proc37908;
drop function func37908;
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
+DROP USER mysqltest_1@localhost;
#
# Bug#41131 "Questions" fails to increment - ignores statements instead stored procs
#
+--echo connect (con1,localhost,root,,);
connect (con1,localhost,root,,);
+--echo connection con1;
connection con1;
--disable_warnings
DROP PROCEDURE IF EXISTS p1;
@@ -321,17 +358,47 @@ let $org_queries= `SHOW STATUS LIKE 'Que
SELECT f1();
CALL p1();
let $new_queries= `SHOW STATUS LIKE 'Queries'`;
---disable_log
+--disable_query_log
let $diff= `SELECT SUBSTRING('$new_queries',9)-SUBSTRING('$org_queries',9)`;
---enable_log
-eval SELECT $diff;
-disconnect con1;
+--enable_query_log
+eval SELECT $diff >= 9;
+--echo connection default;
connection default;
+--echo disconnect con1;
+disconnect con1;
+SELECT 1;
DROP PROCEDURE p1;
DROP FUNCTION f1;
# End of 5.1 tests
+#
+# Bug #17954: Threads_connected > Threads_created
+# Fixed.
+
+--disable_warnings
+DROP VIEW IF EXISTS v1;
+--enable_warnings
+
+CREATE VIEW v1 AS SELECT VARIABLE_NAME AS NAME, CONVERT(VARIABLE_VALUE, UNSIGNED) AS VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS;
+
+SELECT VALUE INTO @tc FROM v1 WHERE NAME = 'Threads_connected';
+# empty result set if fixed
+SELECT NAME FROM v1 WHERE NAME = 'Threads_created' AND VALUE < @tc;
+
+DROP VIEW v1;
+
+#
+# Bug#39916: pool-of-threads fails to increment the number of created threads
+#
+
+SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+ WHERE VARIABLE_NAME = 'Threads_created' AND
+ CONVERT(VARIABLE_VALUE, UNSIGNED) > 0;
+
+
# Restore global concurrent_insert value. Keep in the end of the test file.
---connection default
+--echo connection default;
+connection default;
set @@global.concurrent_insert= @old_concurrent_insert;
+
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (horst:2733) | Horst Hunger | 3 Feb |
