database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

more post-merge fixes:

Browse Source 
* update results
* don't force HA_CREATE_DELAY_KEY_WRITE on all temp tables,
  (bad for CREATE ... LIKE) instead imply it in myisam/aria
* restore HA_ERR_TABLE_DEF_CHANGED in archive
* increase the default number of rwlock classes in P_S to fit all our rwlocks
This commit is contained in:
Sergei Golubchik
2013-07-21 19:24:20 +02:00
parent d1fdb17bfb
commit 13dca0125a
103 changed files with 259 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/alter_table.result
View File

@ -973,12 +973,12 @@ SHOW CREATE TABLE `tt+1`;
Table Create Table Table Create Table
tt+1 CREATE TEMPORARY TABLE `tt+1` ( tt+1 CREATE TEMPORARY TABLE `tt+1` (
`c1` int(11) DEFAULT NULL `c1` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
SHOW CREATE TABLE `tt+2`; SHOW CREATE TABLE `tt+2`;
Table Create Table Table Create Table
tt+2 CREATE TEMPORARY TABLE `tt+2` ( tt+2 CREATE TEMPORARY TABLE `tt+2` (
`c1` int(11) DEFAULT NULL `c1` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE `tt+1`, `tt+2`; DROP TABLE `tt+1`, `tt+2`;
CREATE TABLE `#sql1` (c1 INT); CREATE TABLE `#sql1` (c1 INT);
CREATE TABLE `@0023sql2` (c1 INT); CREATE TABLE `@0023sql2` (c1 INT);
@ -1015,12 +1015,12 @@ SHOW CREATE TABLE `#sql2`;
Table Create Table Table Create Table
#sql2 CREATE TEMPORARY TABLE `#sql2` ( #sql2 CREATE TEMPORARY TABLE `#sql2` (
`c1` int(11) DEFAULT NULL `c1` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
SHOW CREATE TABLE `@0023sql1`; SHOW CREATE TABLE `@0023sql1`;
Table Create Table Table Create Table
@0023sql1 CREATE TEMPORARY TABLE `@0023sql1` ( @0023sql1 CREATE TEMPORARY TABLE `@0023sql1` (
`c1` int(11) DEFAULT NULL `c1` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE `#sql2`, `@0023sql1`; DROP TABLE `#sql2`, `@0023sql1`;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;

6
mysql-test/r/join_outer_innodb.result
View File

@ -481,9 +481,9 @@ drop table t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16;
# #
drop table if exists t1,t2,t3; drop table if exists t1,t2,t3;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
Note 1051 Unknown table 't3' Note 1051 Unknown table 'test.t3'
create table t2(a int,unique key (a)) engine=innodb; create table t2(a int,unique key (a)) engine=innodb;
create table t3(b int) engine=innodb; create table t3(b int) engine=innodb;
create table t1(a int,b int)engine=innodb; create table t1(a int,b int)engine=innodb;

6
mysql-test/r/log_tables.result
View File

@ -430,9 +430,9 @@ My own slow query sleep(2)
My own slow query 0 My own slow query 0
SELECT * FROM mysql.slow_log WHERE seq >= 2 LIMIT 3; SELECT * FROM mysql.slow_log WHERE seq >= 2 LIMIT 3;
start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text thread_id seq start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text thread_id seq
START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 2 2 START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 3 2
START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 2 3 START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 3 3
START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 2 4 START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 3 4
SET GLOBAL slow_query_log = 0; SET GLOBAL slow_query_log = 0;
SET SESSION long_query_time =@saved_long_query_time; SET SESSION long_query_time =@saved_long_query_time;
FLUSH LOGS; FLUSH LOGS;

24
mysql-test/r/merge.result
View File

@ -2883,7 +2883,7 @@ Table Create Table
m2 CREATE TEMPORARY TABLE `m2` ( m2 CREATE TEMPORARY TABLE `m2` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`t1`,`t2`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
SELECT * FROM m2; SELECT * FROM m2;
c1 c2 c1 c2
111 121 111 121
@ -2900,7 +2900,7 @@ Table Create Table
m1 CREATE TEMPORARY TABLE `m1` ( m1 CREATE TEMPORARY TABLE `m1` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`t1`,`t2`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
SELECT * FROM m1; SELECT * FROM m1;
c1 c2 c1 c2
111 121 111 121
@ -2989,7 +2989,7 @@ Table Create Table
m1 CREATE TEMPORARY TABLE `m1` ( m1 CREATE TEMPORARY TABLE `m1` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
INSERT INTO m1 VALUES (511, 521); INSERT INTO m1 VALUES (511, 521);
SELECT * FROM m1; SELECT * FROM m1;
c1 c2 c1 c2
@ -3040,7 +3040,7 @@ Table Create Table
m1 CREATE TEMPORARY TABLE `m1` ( m1 CREATE TEMPORARY TABLE `m1` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`t1`,`t2`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
# #
CREATE TABLE m2 SELECT * FROM m1; CREATE TABLE m2 SELECT * FROM m1;
SHOW CREATE TABLE m2; SHOW CREATE TABLE m2;
@ -3092,7 +3092,7 @@ Table Create Table
m2 CREATE TABLE `m2` ( m2 CREATE TABLE `m2` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`t1`,`t2`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
SELECT * FROM m2; SELECT * FROM m2;
c1 c2 c1 c2
111 121 111 121
@ -3118,7 +3118,7 @@ Table Create Table
m2 CREATE TEMPORARY TABLE `m2` ( m2 CREATE TEMPORARY TABLE `m2` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`t1`,`t2`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
SELECT * FROM m2; SELECT * FROM m2;
c1 c2 c1 c2
111 121 111 121
@ -3288,7 +3288,7 @@ Table Create Table
m2 CREATE TEMPORARY TABLE `m2` ( m2 CREATE TEMPORARY TABLE `m2` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`t1`,`t2`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
SELECT * FROM m2; SELECT * FROM m2;
c1 c2 c1 c2
111 121 111 121
@ -3305,7 +3305,7 @@ Table Create Table
m1 CREATE TEMPORARY TABLE `m1` ( m1 CREATE TEMPORARY TABLE `m1` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`t1`,`t2`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
SELECT * FROM m1; SELECT * FROM m1;
c1 c2 c1 c2
111 121 111 121
@ -3396,7 +3396,7 @@ Table Create Table
m1 CREATE TEMPORARY TABLE `m1` ( m1 CREATE TEMPORARY TABLE `m1` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
INSERT INTO m1 VALUES (511, 521); INSERT INTO m1 VALUES (511, 521);
SELECT * FROM m1; SELECT * FROM m1;
c1 c2 c1 c2
@ -3447,7 +3447,7 @@ Table Create Table
m1 CREATE TEMPORARY TABLE `m1` ( m1 CREATE TEMPORARY TABLE `m1` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`t1`,`t2`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
CREATE TABLE m2 SELECT * FROM m1; CREATE TABLE m2 SELECT * FROM m1;
ERROR HY000: Table 'm2' was not locked with LOCK TABLES ERROR HY000: Table 'm2' was not locked with LOCK TABLES
# #
@ -3492,14 +3492,14 @@ Table Create Table
m2 CREATE TEMPORARY TABLE `m2` ( m2 CREATE TEMPORARY TABLE `m2` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`t1`,`t2`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
LOCK TABLE m1 WRITE, m2 WRITE; LOCK TABLE m1 WRITE, m2 WRITE;
SHOW CREATE TABLE m2; SHOW CREATE TABLE m2;
Table Create Table Table Create Table
m2 CREATE TEMPORARY TABLE `m2` ( m2 CREATE TEMPORARY TABLE `m2` (
`c1` int(11) DEFAULT NULL, `c1` int(11) DEFAULT NULL,
`c2` int(11) DEFAULT NULL `c2` int(11) DEFAULT NULL
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 INSERT_METHOD=LAST UNION=(`t1`,`t2`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
SELECT * FROM m2; SELECT * FROM m2;
c1 c2 c1 c2
111 121 111 121

6
mysql-test/r/multi_update.result
View File

@ -695,7 +695,7 @@ DROP TABLE t1;
# #
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 ( CREATE TABLE t1 (
id int(10) unsigned NOT NULL, id int(10) unsigned NOT NULL,
level tinyint(3) unsigned NOT NULL, level tinyint(3) unsigned NOT NULL,
@ -704,7 +704,7 @@ PRIMARY KEY (id)
INSERT INTO t1 VALUES (2519583,1); INSERT INTO t1 VALUES (2519583,1);
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;
Warnings: Warnings:
Note 1051 Unknown table 't2' Note 1051 Unknown table 'test.t2'
CREATE TABLE t2 ( CREATE TABLE t2 (
club_id int(11) NOT NULL DEFAULT '0', club_id int(11) NOT NULL DEFAULT '0',
profile_id int(11) NOT NULL DEFAULT '0', profile_id int(11) NOT NULL DEFAULT '0',
@ -714,7 +714,7 @@ PRIMARY KEY (profile_id,club_id)
INSERT INTO t2 VALUES (2,2519583,12); INSERT INTO t2 VALUES (2,2519583,12);
DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t3;
Warnings: Warnings:
Note 1051 Unknown table 't3' Note 1051 Unknown table 'test.t3'
CREATE TABLE t3 ( CREATE TABLE t3 (
member_level_id int(11) unsigned NOT NULL DEFAULT '0', member_level_id int(11) unsigned NOT NULL DEFAULT '0',
map_level int(11) unsigned NOT NULL DEFAULT '0', map_level int(11) unsigned NOT NULL DEFAULT '0',

4
mysql-test/r/partition.result
View File

@ -1804,13 +1804,13 @@ engine=MEMORY
partition by key (a); partition by key (a);
REPAIR TABLE t1; REPAIR TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
OPTIMIZE TABLE t1; OPTIMIZE TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize note The storage engine for the table doesn't support optimize test.t1 optimize note The storage engine for the table doesn't support optimize
CHECK TABLE t1; CHECK TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check status OK test.t1 check note The storage engine for the table doesn't support check
ANALYZE TABLE t1; ANALYZE TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 analyze note The storage engine for the table doesn't support analyze test.t1 analyze note The storage engine for the table doesn't support analyze

10
mysql-test/r/plugin.result
View File

@ -152,6 +152,14 @@ Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL `complex`='c,c,c' `a` int(11) DEFAULT NULL `complex`='c,c,c'
) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `one_or_two`='ttt' `YESNO`=SSS `VAROPT`='5' `ULL`=10000000 ) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `one_or_two`='ttt' `YESNO`=SSS `VAROPT`='5' `ULL`=10000000
alter table t1 one_or_two=two;
Warnings:
Note 1105 EXAMPLE DEBUG: Field `a` COMPLEX 'c,c,c' -> 'c,c,c'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL `complex`='c,c,c'
) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `YESNO`=SSS `VAROPT`='5' `ULL`=10000000 `one_or_two`=two
drop table t1; drop table t1;
#illegal value error #illegal value error
SET SQL_MODE=''; SET SQL_MODE='';
@ -194,6 +202,8 @@ t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL `a` int(11) DEFAULT NULL
) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `varopt`=15 ) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `varopt`=15
alter table t1 varopt=default; alter table t1 varopt=default;
Warnings:
Note 1105 EXAMPLE DEBUG: Field `a` COMPLEX '(null)' -> '(null)'
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (

2
mysql-test/r/show_check.result
View File

@ -198,7 +198,7 @@ show create table t2;
Table Create Table Table Create Table
t2 CREATE TEMPORARY TABLE `t2` ( t2 CREATE TEMPORARY TABLE `t2` (
`a` int(11) NOT NULL `a` int(11) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t2; drop table t2;
create table t1 ( create table t1 (
test_set set( 'val1', 'val2', 'val3' ) not null default '', test_set set( 'val1', 'val2', 'val3' ) not null default '',

2
mysql-test/r/sp.result
View File

@ -7788,8 +7788,6 @@ message
You should see this message and the warning that generated this You should see this message and the warning that generated this
Level Code Message Level Code Message
Warning 1329 No data - zero rows fetched, selected, or processed Warning 1329 No data - zero rows fetched, selected, or processed
Warnings:
Warning 1329 No data - zero rows fetched, selected, or processed
drop procedure p1; drop procedure p1;
drop procedure p0; drop procedure p0;
drop table t1; drop table t1;

3
mysql-test/r/strict.result
View File

@ -1517,12 +1517,11 @@ Warning 1411 Incorrect datetime value: '0000' for function str_to_date
SET sql_mode='NO_ZERO_IN_DATE'; SET sql_mode='NO_ZERO_IN_DATE';
SELECT STR_TO_DATE('2001','%Y'),CONCAT(STR_TO_DATE('2001','%Y')), STR_TO_DATE('2001','%Y')+1, STR_TO_DATE('0000','%Y')+1; SELECT STR_TO_DATE('2001','%Y'),CONCAT(STR_TO_DATE('2001','%Y')), STR_TO_DATE('2001','%Y')+1, STR_TO_DATE('0000','%Y')+1;
STR_TO_DATE('2001','%Y') CONCAT(STR_TO_DATE('2001','%Y')) STR_TO_DATE('2001','%Y')+1 STR_TO_DATE('0000','%Y')+1 STR_TO_DATE('2001','%Y') CONCAT(STR_TO_DATE('2001','%Y')) STR_TO_DATE('2001','%Y')+1 STR_TO_DATE('0000','%Y')+1
NULL NULL NULL NULL NULL NULL NULL 1
Warnings: Warnings:
Warning 1411 Incorrect datetime value: '2001' for function str_to_date Warning 1411 Incorrect datetime value: '2001' for function str_to_date
Warning 1411 Incorrect datetime value: '2001' for function str_to_date Warning 1411 Incorrect datetime value: '2001' for function str_to_date
Warning 1411 Incorrect datetime value: '2001' for function str_to_date Warning 1411 Incorrect datetime value: '2001' for function str_to_date
Warning 1411 Incorrect datetime value: '0000' for function str_to_date
# #
# End of 5.6 tests # End of 5.6 tests
# #

2
mysql-test/r/subselect_exists_to_in.result
View File

@ -5906,7 +5906,7 @@ CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0); INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
DROP TABLE IF EXISTS t3; DROP TABLE IF EXISTS t3;
Warnings: Warnings:
Note 1051 Unknown table 't3' Note 1051 Unknown table 'test.t3'
CREATE TABLE t3 ( f3 int) ; CREATE TABLE t3 ( f3 int) ;
INSERT INTO t3 VALUES (0),(0); INSERT INTO t3 VALUES (0),(0);
SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ; SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;

4
mysql-test/suite/archive/archive.result
View File

@ -12837,7 +12837,7 @@ show create table t1;
Table Create Table Table Create Table
t1 CREATE TEMPORARY TABLE `t1` ( t1 CREATE TEMPORARY TABLE `t1` (
`a` int(11) DEFAULT NULL `a` int(11) DEFAULT NULL
) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
alter table t1 add column b varchar(10); alter table t1 add column b varchar(10);
select * from t1; select * from t1;
a b a b
@ -12849,5 +12849,5 @@ Table Create Table
t1 CREATE TEMPORARY TABLE `t1` ( t1 CREATE TEMPORARY TABLE `t1` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,
`b` varchar(10) DEFAULT NULL `b` varchar(10) DEFAULT NULL
) ENGINE=ARCHIVE DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
drop table t1; drop table t1;

2
mysql-test/suite/archive/discover.result
View File

@ -86,7 +86,7 @@ flush tables;
drop table t0; drop table t0;
show status like 'Handler_discover'; show status like 'Handler_discover';
Variable_name Value Variable_name Value
Handler_discover 7 Handler_discover 6
# #
# Bug#45377: ARCHIVE tables aren't discoverable after OPTIMIZE # Bug#45377: ARCHIVE tables aren't discoverable after OPTIMIZE
# #

2
mysql-test/suite/archive/partition_archive.result
View File

@ -30,7 +30,7 @@ partition by list (a)
(partition p0 values in (1), partition p1 values in (2)); (partition p0 values in (1), partition p1 values in (2));
insert into t1 values (1), (2); insert into t1 values (1), (2);
create index inx on t1 (a); create index inx on t1 (a);
ERROR HY000: Can't create table `db99`.`#sql-temporary` (errno: 1 "Operation not permitted") ERROR HY000: Can't create table `db99`.`#sql-temporary` (errno: 140 "Wrong create options")
alter table t1 add partition (partition p2 values in (3)); alter table t1 add partition (partition p2 values in (3));
alter table t1 drop partition p2; alter table t1 drop partition p2;
use test; use test;

2
mysql-test/suite/innodb/r/innodb_bug56947.result
View File

@ -2,7 +2,7 @@ SET GLOBAL innodb_file_per_table=0;
create table bug56947(a int not null) engine = innodb; create table bug56947(a int not null) engine = innodb;
SET DEBUG_DBUG='+d,ib_rebuild_cannot_rename'; SET DEBUG_DBUG='+d,ib_rebuild_cannot_rename';
alter table bug56947 add unique index (a); alter table bug56947 add unique index (a);
ERROR HY000: Got error 11 "Resource temporarily unavailable" from storage engine ERROR HY000: Got error 11 "Resource temporarily unavailable" from storage engine InnoDB
SET DEBUG_DBUG='-d,ib_rebuild_cannot_rename'; SET DEBUG_DBUG='-d,ib_rebuild_cannot_rename';
check table bug56947; check table bug56947;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text

64
mysql-test/suite/parts/r/partition_alter1_1_innodb.result
View File

@ -849,7 +849,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -1341,7 +1341,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -1848,7 +1848,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -2349,7 +2349,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -2850,7 +2850,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -3360,7 +3360,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -3872,7 +3872,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -4372,7 +4372,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -4865,7 +4865,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -5357,7 +5357,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -5864,7 +5864,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -6365,7 +6365,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -6866,7 +6866,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -7376,7 +7376,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -7888,7 +7888,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -8388,7 +8388,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -8898,7 +8898,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -9406,7 +9406,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -9929,7 +9929,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -10446,7 +10446,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -10963,7 +10963,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -11489,7 +11489,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -12017,7 +12017,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -12533,7 +12533,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -13042,7 +13042,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -13550,7 +13550,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -14073,7 +14073,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -14590,7 +14590,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -15107,7 +15107,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -15633,7 +15633,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -16161,7 +16161,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -16677,7 +16677,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;

4
mysql-test/suite/parts/r/partition_basic_symlink_innodb.result
View File

@ -16,12 +16,12 @@ PARTITION p1
DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir' DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir'
INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir'
); );
ERROR HY000: Can't create table 'test.t1' (errno: 140 "Wrong create options") ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
SHOW WARNINGS; SHOW WARNINGS;
Level Code Message Level Code Message
Warning 1478 InnoDB: DATA DIRECTORY requires innodb_file_per_table. Warning 1478 InnoDB: DATA DIRECTORY requires innodb_file_per_table.
Warning 1478 InnoDB: INDEX DIRECTORY is not supported Warning 1478 InnoDB: INDEX DIRECTORY is not supported
Error 1005 Can't create table 'test.t1' (errno: 140 "Wrong create options") Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options")
Error 6 Error on delete of 'MYSQLD_DATADIR/test/t1.par' (Errcode: 2 "No such file or directory") Error 6 Error on delete of 'MYSQLD_DATADIR/test/t1.par' (Errcode: 2 "No such file or directory")
# #
# InnoDB is different from MyISAM in that it uses a text file # InnoDB is different from MyISAM in that it uses a text file

22
mysql-test/suite/parts/r/partition_engine_innodb.result
View File

@ -489,7 +489,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -947,7 +947,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -1409,7 +1409,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -1934,7 +1934,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -2435,7 +2435,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -2897,7 +2897,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -3356,7 +3356,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -3818,7 +3818,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -4283,7 +4283,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -4737,7 +4737,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;
@ -5192,7 +5192,7 @@ test.t1 optimize status OK
# check layout success: 1 # check layout success: 1
REPAIR TABLE t1 EXTENDED; REPAIR TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair note The storage engine for the table doesn't support repair
# check layout success: 1 # check layout success: 1
TRUNCATE t1; TRUNCATE t1;

4
mysql-test/suite/perfschema/r/ortho_iter.result
View File

@ -110,12 +110,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/privilege_table_io.result
View File

@ -41,12 +41,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_disable_idle.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_disable_stages.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_disable_statements.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_disable_waits.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_innodb.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_account.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_cond_class.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_file_class.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_file_inst.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 0 performance_schema_max_file_instances 0
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_host.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 0 performance_schema_max_mutex_classes 0
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 0 performance_schema_max_mutex_instances 0
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

2
mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
View File

@ -93,7 +93,7 @@ performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

6
mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 0 performance_schema_max_rwlock_instances 0
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50
@ -106,7 +106,7 @@ show engine PERFORMANCE_SCHEMA status;
show status like "performance_schema%"; show status like "performance_schema%";
show variables like "performance_schema_max_rwlock_classes"; show variables like "performance_schema_max_rwlock_classes";
Variable_name Value Variable_name Value
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
select count(*) > 0 from performance_schema.setup_instruments select count(*) > 0 from performance_schema.setup_instruments
where name like "wait/synch/rwlock/%"; where name like "wait/synch/rwlock/%";
count(*) > 0 count(*) > 0

4
mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_socket_class.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 0 performance_schema_max_socket_classes 0
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 0 performance_schema_max_socket_instances 0
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_stage_class.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 0 performance_schema_max_stage_classes 0
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_stages_history.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

2
mysql-test/suite/perfschema/r/start_server_no_statement_class.result
View File

@ -88,7 +88,7 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000

4
mysql-test/suite/perfschema/r/start_server_no_statements_history.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 0 performance_schema_max_table_handles 0
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_table_inst.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 0 performance_schema_max_table_instances 0
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_thread_class.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 0 performance_schema_max_thread_classes 0

4
mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_user.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_waits_history.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_off.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/start_server_on.result
View File

@ -88,12 +88,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
View File

@ -58,12 +58,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
View File

@ -57,12 +57,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
View File

@ -58,12 +58,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
View File

@ -57,12 +57,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
View File

@ -56,12 +56,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
View File

@ -55,12 +55,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
View File

@ -56,12 +56,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
View File

@ -55,12 +55,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_off.result
View File

@ -57,12 +57,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
View File

@ -58,12 +58,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
View File

@ -57,12 +57,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
View File

@ -58,12 +58,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
View File

@ -57,12 +57,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
View File

@ -60,12 +60,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
View File

@ -59,12 +59,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
View File

@ -60,12 +60,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
View File

@ -59,12 +59,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
View File

@ -58,12 +58,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
View File

@ -57,12 +57,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
View File

@ -58,12 +58,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
View File

@ -57,12 +57,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
View File

@ -60,12 +60,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
View File

@ -59,12 +59,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
View File

@ -60,12 +60,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
View File

@ -59,12 +59,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
View File

@ -60,12 +60,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
View File

@ -59,12 +59,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
View File

@ -60,12 +60,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
View File

@ -59,12 +59,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
View File

@ -58,12 +58,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
View File

@ -57,12 +57,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
View File

@ -58,12 +58,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
View File

@ -57,12 +57,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
View File

@ -60,12 +60,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
View File

@ -59,12 +59,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
View File

@ -60,12 +60,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

4
mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
View File

@ -59,12 +59,12 @@ performance_schema_max_file_handles 32768
performance_schema_max_file_instances 10000 performance_schema_max_file_instances 10000
performance_schema_max_mutex_classes 200 performance_schema_max_mutex_classes 200
performance_schema_max_mutex_instances 5000 performance_schema_max_mutex_instances 5000
performance_schema_max_rwlock_classes 30 performance_schema_max_rwlock_classes 40
performance_schema_max_rwlock_instances 5000 performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10 performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000 performance_schema_max_socket_instances 1000
performance_schema_max_stage_classes 150 performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 174 performance_schema_max_statement_classes 175
performance_schema_max_table_handles 1000 performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500 performance_schema_max_table_instances 500
performance_schema_max_thread_classes 50 performance_schema_max_thread_classes 50

2
mysql-test/suite/plugins/r/audit_null.result
View File

@ -81,8 +81,8 @@ root[root] @ localhost [] mysql.table_stats : write
root[root] @ localhost [] mysql.column_stats : write root[root] @ localhost [] mysql.column_stats : write
root[root] @ localhost [] mysql.index_stats : write root[root] @ localhost [] mysql.index_stats : write
root[root] @ localhost [] >> alter table t2 add column b int root[root] @ localhost [] >> alter table t2 add column b int
root[root] @ localhost [] test.t2 : read
root[root] @ localhost [] test.t2 : alter root[root] @ localhost [] test.t2 : alter
root[root] @ localhost [] test.t2 : read
root[root] @ localhost [] >> create definer=testuser@localhost view v1 as select t2.a+1, t2_copy.a+2 from t2, t2 as t2_copy root[root] @ localhost [] >> create definer=testuser@localhost view v1 as select t2.a+1, t2_copy.a+2 from t2, t2 as t2_copy
root[root] @ localhost [] test.t2 : read root[root] @ localhost [] test.t2 : read
root[root] @ localhost [] test.t2 : read root[root] @ localhost [] test.t2 : read

4
mysql-test/suite/plugins/r/show_all_plugins.result
View File

@ -4,8 +4,8 @@ Variable_name Value
Opened_plugin_libraries 0 Opened_plugin_libraries 0
select * from information_schema.all_plugins where plugin_library='ha_example.so'; select * from information_schema.all_plugins where plugin_library='ha_example.so';
PLUGIN_NAME PLUGIN_VERSION PLUGIN_STATUS PLUGIN_TYPE PLUGIN_TYPE_VERSION PLUGIN_LIBRARY PLUGIN_LIBRARY_VERSION PLUGIN_AUTHOR PLUGIN_DESCRIPTION PLUGIN_LICENSE LOAD_OPTION PLUGIN_MATURITY PLUGIN_AUTH_VERSION PLUGIN_NAME PLUGIN_VERSION PLUGIN_STATUS PLUGIN_TYPE PLUGIN_TYPE_VERSION PLUGIN_LIBRARY PLUGIN_LIBRARY_VERSION PLUGIN_AUTHOR PLUGIN_DESCRIPTION PLUGIN_LICENSE LOAD_OPTION PLUGIN_MATURITY PLUGIN_AUTH_VERSION
EXAMPLE 0.1 NOT INSTALLED STORAGE ENGINE 100003.0 ha_example.so 1.5 Brian Aker, MySQL AB Example storage engine GPL OFF Experimental 0.1 EXAMPLE 0.1 NOT INSTALLED STORAGE ENGINE 100003.0 ha_example.so 1.7 Brian Aker, MySQL AB Example storage engine GPL OFF Experimental 0.1
UNUSABLE 3.14 NOT INSTALLED DAEMON 100003.0 ha_example.so 1.5 Sergei Golubchik Unusable Daemon GPL OFF Experimental 3.14.15.926 UNUSABLE 3.14 NOT INSTALLED DAEMON 100003.0 ha_example.so 1.7 Sergei Golubchik Unusable Daemon GPL OFF Experimental 3.14.15.926
show status like '%libraries%'; show status like '%libraries%';
Variable_name Value Variable_name Value
Opened_plugin_libraries 1 Opened_plugin_libraries 1

2
mysql-test/suite/rpl/r/replace.result
View File

@ -2,7 +2,7 @@ include/master-slave.inc
[connection master] [connection master]
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
CREATE TABLE t1 (pr_id int(10) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY, pr_page int(11) NOT NULL, pr_type varbinary(60) NOT NULL, test int, UNIQUE KEY pr_pagetype (pr_page,pr_type)) ENGINE=myisam AUTO_INCREMENT=136; CREATE TABLE t1 (pr_id int(10) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY, pr_page int(11) NOT NULL, pr_type varbinary(60) NOT NULL, test int, UNIQUE KEY pr_pagetype (pr_page,pr_type)) ENGINE=myisam AUTO_INCREMENT=136;
insert into t1 (pr_page, pr_type, test) values(1,"one",0),(2,"two",0); insert into t1 (pr_page, pr_type, test) values(1,"one",0),(2,"two",0);
select * from t1; select * from t1;

1
mysql-test/t/log_tables.test
View File

@ -3,7 +3,6 @@
# #
# Basic log tables test # Basic log tables test
# #
# check that CSV engine was compiled in # check that CSV engine was compiled in
--source include/have_csv.inc --source include/have_csv.inc

2
mysql-test/t/plugin.test
View File

@ -129,6 +129,8 @@ alter table t1 ULL=10000000;
show create table t1; show create table t1;
alter table t1 change a a int complex='c,c,c'; alter table t1 change a a int complex='c,c,c';
show create table t1; show create table t1;
alter table t1 one_or_two=two;
show create table t1;
drop table t1; drop table t1;
--echo #illegal value error --echo #illegal value error

7
sql/sql_table.cc
View File

@ -4008,9 +4008,6 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
} }
} }
if (create_info->tmp_table())
create_info->options|=HA_CREATE_DELAY_KEY_WRITE;
/* Give warnings for not supported table options */ /* Give warnings for not supported table options */
#if defined(WITH_ARIA_STORAGE_ENGINE) #if defined(WITH_ARIA_STORAGE_ENGINE)
extern handlerton *maria_hton; extern handlerton *maria_hton;
@ -8470,10 +8467,6 @@ end_inplace:
DEBUG_SYNC(thd, "alter_table_before_main_binlog"); DEBUG_SYNC(thd, "alter_table_before_main_binlog");
ha_binlog_log_query(thd, create_info->db_type, LOGCOM_ALTER_TABLE,
thd->query(), thd->query_length(),
alter_ctx.db, alter_ctx.table_name);
DBUG_ASSERT(!(mysql_bin_log.is_open() && DBUG_ASSERT(!(mysql_bin_log.is_open() &&
thd->is_current_stmt_binlog_format_row() && thd->is_current_stmt_binlog_format_row() &&
(create_info->tmp_table()))); (create_info->tmp_table())));

21
storage/archive/ha_archive.cc
View File

@ -484,6 +484,9 @@ Archive_share *ha_archive::get_share(const char *table_name, int *rc)
share= tmp_share; share= tmp_share;
if (archive_tmp.version == 1) if (archive_tmp.version == 1)
share->read_v1_metafile(); share->read_v1_metafile();
else if (frm_compare(&archive_tmp))
*rc= HA_ERR_TABLE_DEF_CHANGED;
azclose(&archive_tmp); azclose(&archive_tmp);
set_ha_share_ptr(static_cast<Handler_share*>(tmp_share)); set_ha_share_ptr(static_cast<Handler_share*>(tmp_share));
@ -741,7 +744,7 @@ int ha_archive::create(const char *name, TABLE *table_arg,
if (!(field->flags & AUTO_INCREMENT_FLAG)) if (!(field->flags & AUTO_INCREMENT_FLAG))
{ {
error= -1; error= HA_WRONG_CREATE_OPTION;
DBUG_PRINT("ha_archive", ("Index error in creating archive table")); DBUG_PRINT("ha_archive", ("Index error in creating archive table"));
goto error; goto error;
} }
@ -1847,17 +1850,17 @@ void ha_archive::destroy_record_buffer(archive_record_buffer *r)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
/*
In archive *any* ALTER should cause a table to be rebuilt,
no ALTER can be frm-only.
Because after any change to the frm file archive must update the
frm image in the ARZ file. And this cannot be done in-place, it
requires ARZ file to be recreated from scratch
*/
bool ha_archive::check_if_incompatible_data(HA_CREATE_INFO *info, bool ha_archive::check_if_incompatible_data(HA_CREATE_INFO *info,
uint table_changes) uint table_changes)
{ {
if (info->auto_increment_value != stats.auto_increment_value || return COMPATIBLE_DATA_NO;
(info->used_fields & HA_CREATE_USED_DATADIR) ||
info->data_file_name ||
(info->used_fields & HA_CREATE_USED_COMMENT) ||
table_changes != IS_EQUAL_YES)
return COMPATIBLE_DATA_NO;
return COMPATIBLE_DATA_YES;
} }

4
storage/example/ha_example.cc
View File

@ -944,8 +944,8 @@ bool ha_example::check_if_incompatible_data(HA_CREATE_INFO *info,
boolparam requires a table to be rebuilt, while changing strparam boolparam requires a table to be rebuilt, while changing strparam
or enumparam - does not. or enumparam - does not.
For debugging purposes we'll announce this to the client For debugging purposes we'll announce this to the user
(don't do it in your engine!) (don't do it in production!)
*/ */
if (param_new->ullparam != param_old->ullparam) if (param_new->ullparam != param_old->ullparam)

2
storage/innobase/handler/handler0alter.cc
View File

@ -156,7 +156,7 @@ my_error_innodb(
ut_error; ut_error;
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
default: default:
my_error(ER_GET_ERRNO, MYF(0), error); my_error(ER_GET_ERRNO, MYF(0), error, "InnoDB");
break; break;
} }
} }

Some files were not shown because too many files have changed in this diff Show More