Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mysql 5.6.11 #3

Closed
wants to merge 148 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
ff9c9e5
Fixed 5.6.11 code/test/distro errors.
steaphangreene Jul 7, 2012
eec604a
Disable binlog.binlog_server_start_options
jtolmer Apr 19, 2013
9dd3834
Added fb.cmake Facebook build config file.
steaphangreene Oct 23, 2012
5aee376
Disable PerfSchema By Default
steaphangreene Mar 28, 2013
e9bfa36
Add -DMY_PTHREAD_FASTMUTEX for 5.6
steaphangreene Feb 28, 2013
057035a
Stop spawning dummy threads on client library initialization (5.6)
Apr 5, 2013
f37b8e8
Share more structures
steaphangreene Mar 31, 2013
6eb74f8
Adding xtrabackup files
steaphangreene Mar 4, 2013
74b6cc6
Integrate xtrabackup into tree
steaphangreene Mar 4, 2013
922d355
Prevent xtrabackup apply-log disk-space bloat
Mar 28, 2013
38d9cb3
Facebook changes to xtrabackup
steaphangreene Mar 27, 2013
c45dad7
Port v5.1 innodb stress tests to 5.6
steaphangreene Apr 2, 2013
bd4a4bc
Add trx pointer to struct mtr_t
steaphangreene Mar 29, 2013
77f5b2b
Port Percona fake changes patch to 5.6
steaphangreene Mar 28, 2013
64c14da
Parse, but ignore, MEMECACHE_DIRTY keyword.
steaphangreene Mar 20, 2012
b6311ac
Use both upstream and our crc algo, migrating to upstream.
steaphangreene Mar 21, 2012
e3e2235
Fix our acl damage in mysql_upgrade
steaphangreene Oct 25, 2012
0a1f919
Allow reading of headerless compressed pages.
steaphangreene Oct 30, 2012
e5c4318
Port v5.1 SQL_NO_FCACHE to 5.6
steaphangreene Mar 28, 2012
a334b43
Fix unsigned arithmetic
Mar 27, 2012
386ab02
Port Control Cross-Table Access to 5.6
emayanke Oct 29, 2012
ef2e91b
Port v5.1 super_read_only
steaphangreene Oct 19, 2012
22a8b8c
Added new fast timer support.
steaphangreene Apr 24, 2012
27e4c3b
Port v5.1 Extra Stats: Basic Stats
steaphangreene Mar 31, 2013
a535b68
Port v5.1 Extra Stats: BinLog BaseDirs
steaphangreene Apr 10, 2012
83c4e4f
Port v5.1 Extra Stats: mutex and rw-lock
steaphangreene Apr 24, 2012
79ee703
Port v5.1 Extra Stats: InnoDB transaction logging
steaphangreene Apr 24, 2012
44bed9b
Port v5.1 Extra Stats: More buffer pool stats.
steaphangreene Apr 24, 2012
a42b065
Port v5.1 Extra Stats: Command Timers
steaphangreene Apr 25, 2012
a334bd1
Port v5.1 Allow innodb_lock_wait_timeout=0
steaphangreene Apr 18, 2012
141168b
Port v5.1 Extra Stats: records_in_range_seconds
steaphangreene Apr 27, 2012
7b50c38
Port v5.1 Extra Stats: callers of os_file_flush
steaphangreene Apr 27, 2012
6fcbe16
Port v5.1 Extra Stats: IO Perf Counters
steaphangreene Apr 30, 2012
a32d118
Port v5.1 Extra Stats: Insert Buffer and Adaptive Hash
steaphangreene May 2, 2012
24b3d11
Port v5.1 Extra Stats: Time Master Thread Tasks
steaphangreene May 1, 2012
dbc3c69
Port v5.1 SysVar: innodb_deadlock_detect
steaphangreene Mar 28, 2013
c54c3d3
Port v5.1 Extra Stats: InnoDB Lock Status
steaphangreene Nov 9, 2012
a90e2a3
Port v5.1 Extra Stats: Remove Transactions
steaphangreene May 2, 2012
90429dc
Port v5.1 Extra Stats: Flushed Neighbor Counters
steaphangreene Nov 9, 2012
0dcb3f1
Port v5.1 Extra Stats: SHOW ENGINE INNODB TRANSACTION STATUS
steaphangreene May 2, 2012
8068673
Port v5.1 SHOW STATUS tests
steaphangreene May 2, 2012
a4a48c3
Port v5.1 Slow Query Log Changes
steaphangreene May 24, 2012
1482a90
Port v5.1 Extra Stats: Pages Evicted
steaphangreene Jun 7, 2012
64a2cef
Port v5.1 InnoDB Commit and Rollback Counters
steaphangreene May 23, 2012
246d2fa
Port v5.1 Extra Stats: Per-Table
steaphangreene Apr 10, 2013
c230745
Port v5.1 os_aio_old/slow changes
steaphangreene Mar 28, 2013
6fc26a7
Port v5.1 Extra Stats: Hide BinLog Threads
steaphangreene Jun 7, 2012
118e571
Port v5.1 IS.User_Stats to 5.6
Apr 12, 2013
cffd602
Log changes to 'read_only' and 'super_read_only'
steaphangreene Dec 11, 2012
e5c8ab5
Adding logging for durability changes
Mar 12, 2013
3db5967
Port binlog_bytes_written status to 5.6
Oct 23, 2012
eb5859e
Porting per session stats from 5.1 to 5.6
Apr 12, 2013
92c3a2a
Port per query stats from 5.1 to 5.6
Sep 25, 2012
e2b9411
Porting more table stats changes from 5.1 to 5.6
Apr 16, 2013
b581af4
port global per page IO stats from 5.1 to 5.6
steaphangreene Oct 12, 2012
84ee91f
Porting secondary index to 5.6
Oct 18, 2012
1c1c30d
Port v5.1 SHOW MASTER LOGS without SUPER privilege
steaphangreene Oct 19, 2012
44bb61a
Port v5.1 process_can_disable_bin_log
steaphangreene Oct 19, 2012
42346f9
Port v5.1 sql_log_bin changes
steaphangreene Oct 19, 2012
08286b9
Port replication counter stats to 5.6
Oct 23, 2012
6483211
Port Stats: binlog slave offset to 5.6
Oct 23, 2012
d456588
Port Stats: slow_log_if_rows_examined to 5.6
Apr 10, 2013
2940cda
Port Per-Tablespace Mutex Contention Fix to 5.6
Apr 12, 2013
dd377be
Port Fuzzy Checkpoint Limits to 5.6
Oct 19, 2012
dad6a4d
Port Stats: Log -vs- Double-Write to 5.6
Oct 26, 2012
91ad928
Port Ignore innodb_thread_concurrency for Replication Thread to 5.6
Mar 28, 2013
3bd6c63
Port Fix Locality of trx_ts to 5.6
Nov 1, 2012
5f9cf36
Port Stats: Slow IOs to 5.6
Apr 12, 2013
5a4c16f
Port Optimizations for os_aio_thread_buffer to 5.6
Oct 31, 2012
48af57e
Port per page type table stats, and fix native_aio data stats
steaphangreene Apr 17, 2013
0cc3917
Replication IO thread retries more frequently
jtolmer Nov 7, 2012
bf47c0a
Port v5.1 Compression Stats
Apr 17, 2013
c1c7d8c
Make replication and client connection compression configurable.
steaphangreene Dec 14, 2012
2dd83ca
Port disable_slave_update_table_stats change to 5.6
Mar 28, 2013
db8eb38
Port unix datagram socket from 5.1 to 5.6
rvsprvsp Dec 14, 2012
f2c05a0
Ported Working Set Size to 5.6
Apr 12, 2013
192f35c
Check how max_binlog_cache_size affects LOAD DATA INFILE
rvsprvsp Nov 17, 2012
adadc00
Fix an inifinite loop while reading compressed pages
rvsprvsp Nov 26, 2012
8bdd21d
Port additional session stats in SHOW PROCESSLIST
steaphangreene Mar 28, 2013
2c08050
Port v5.1 fix for bug #60682 to 5.6
rvsprvsp Nov 28, 2012
36a220d
Make DROP DATABASE replicate safely with FK constraints
rvsprvsp Nov 29, 2012
69645eb
Check for a killed connection while building a previous version.
jtolmer Mar 28, 2013
e3c31a0
Replication Monitoring to 5.6
steaphangreene Dec 14, 2012
c5369e9
Port rpl_read_size to 5.6
rvsprvsp Dec 14, 2012
95dfb4a
Add reset_seconds_behind_master and Relay_log_io_connected
jtolmer Dec 19, 2012
7f9705c
Reduce LOCK_log mutex contention during lock during binlog reads.
steaphangreene Apr 18, 2013
49ecae0
Port Stats: Peak Lag to 5.6
Oct 26, 2012
bc267c3
Fix failure of set relay_log_info_repository = 'file'
rvsprvsp Jan 9, 2013
44051a2
Fix checksum errors in 5.6 slave when 5.6 master is downgraded to 5.1
rvsprvsp Jan 11, 2013
5df7a35
Test autoinc intvar not persisted across relay-log events on slave
rvsprvsp Feb 13, 2013
cf410f6
Port Warn on Purge with Active Slave to 5.6
rvsprvsp Feb 13, 2013
382ea2c
port add rpl_event_buffer_size to 5.6
rvsprvsp Apr 18, 2013
57ecb0a
Set Default metadata_locks_hash_instances=256
steaphangreene Feb 19, 2013
72e95f1
Port Compression: Reduce Calls to btr_cur_optimistic_insert to 5.6
Nov 27, 2012
10f24ce
Change the default value for innodb_log_compressed_pages to false
Feb 27, 2013
64ba92e
Fix changing from gtid-based to position-based replication
rvsprvsp Feb 23, 2013
d830046
create new config option enable_gitd_on_new_slave_with_old_master
rvsprvsp Feb 25, 2013
f172125
Set Default table_open_cache_instances=8
jtolmer Mar 1, 2013
8a133e2
Port v5.1 InnoChecksum: Page Type
steaphangreene Jun 8, 2012
40f3202
Port v5.1 extra page stats for innochecksum
Oct 30, 2012
6bceb58
Port compressed, and fix uncompressed, page support in innochecksum
Apr 16, 2013
ee8dedf
Port v5.1 tests for non-blocking read-only
Mar 12, 2013
107a4b7
Port Add --timeout option for mysqldump to 5.6
Mar 12, 2013
8c30d8f
Port ALL_O_DIRECT to 5.6
Mar 13, 2013
e19fd7c
Allow mysqldump from 5.6 to dump 5.1 tables.
Mar 15, 2013
b763904
Add support for MYSQL_SYSVAR_DOUBLE.
Dec 18, 2012
68a7fe1
Port Fast Index Creation to 5.6
Mar 25, 2013
3cfd01f
Port Compression: Making empty space reserved dynamic to 5.6
Mar 21, 2013
b191c2c
Add innodb_page_cleaner_interval_millis
mdcallag Mar 20, 2013
6130989
Made innodb_max_dirty_pages_pct my.cnf variable a double
Mar 25, 2013
07ee2aa
Merge aio page read requests
Mar 27, 2013
ee024c6
Add logical read-ahead to InnoDB.
Mar 28, 2013
fd05d7d
Add mysqldump support for logical read ahead
steaphangreene Apr 10, 2013
e1ff3c4
Port testing of random compression failures
jtolmer Mar 29, 2013
c23127a
Add support for srv_unzip_LRU_pct and innodb_lru_io_to_unzip_factor.
Mar 30, 2013
a73beda
Implement START TRANSACTION WITH CONSISTENT INNODB SNAPSHOT
jtolmer Mar 18, 2013
86e9ffc
Add the value of padding to table statistics in 5.6.
steaphangreene Apr 12, 2013
9ff3d3f
Make "FACEBOOK" the default crc setting.
steaphangreene Oct 24, 2012
b11c652
Write old FB crcs by default
steaphangreene Oct 26, 2012
b723a0a
Waste less memory on os_event structs
steaphangreene Feb 21, 2013
f8c37c4
Port fix for mysqlbinlog reading big records from stdin
rvsprvsp Apr 25, 2013
9d571cb
port streaming binlogs to 5.6.11
rvsprvsp Apr 25, 2013
09cb719
Make mysqldump not lock all tables with --single-transaction
Apr 26, 2013
71e9e5a
Make default value of binlog_checksum 'NONE'
rvsprvsp Apr 26, 2013
9261f0f
Two fixes for logical read-ahead feature
Apr 23, 2013
39309ee
Add config option gtid_deployment_step useful for deployment
rvsprvsp Mar 20, 2013
eb621d9
Fix disable_deadlock_detect
steaphangreene Apr 30, 2013
a4dad83
Port v5.1 Compression: Reduce Log Records
Apr 19, 2013
1594ae8
Port v5.1 Cache buf_page_t Memory Allocations
Apr 16, 2013
5db55fd
Port v5.1 Cache mem_block_t Memory Allocations
Apr 4, 2013
58e9fbc
Stabalize main.partition_innodb test
steaphangreene May 2, 2013
5ef7807
Move InnoDB message from warning to info
jtolmer May 9, 2013
8af6176
Add error messages for main.slow_log_extra_big
May 7, 2013
0bb21a2
Initialize innodb_sync_pool_size, even without mysql.
steaphangreene May 10, 2013
4596d7d
Initialize error messages for xtrabackup
May 10, 2013
58f3e15
xtrabackup: Do not FLUSH TABLES WITH READ LOCK on master
May 9, 2013
7b2bb76
Add GTID info to START TRANSACTION WITH CONSISTENT INNODB SNAPSHOT
rvsprvsp Apr 26, 2013
df04aae
Oracle's diff for MTS recovery SEGV
jtolmer May 9, 2013
fc14f6c
Back-port Oracle's stop-sleeping patch from 5.6
steaphangreene May 3, 2013
e68ec58
Port v5.1: Skip fsyncs on O_DIRECT
steaphangreene May 9, 2013
4dd11b5
Port v5.1 Prefix Index Queries Optimization
steaphangreene May 8, 2013
e8d01a8
Create xtrabackup_logfile in the supplied target_dir
May 13, 2013
3bbd76e
Xtrabackup: Always use default error messages
May 10, 2013
d0aad62
Change binlog index file format to incude previous gtid set.
rvsprvsp May 2, 2013
911133c
Fix CREATE TABLE ... LIKE to handle KEY_BLOCK_SIZE
jtolmer May 13, 2013
0fd6a6d
Zero-padding trx log write to OS block size
Apr 19, 2013
cc11939
Oracle's fix for flush tables breaking replication
rvsprvsp May 13, 2013
4c478e2
Back-port Oracle's fix for CREATE TABLE IF NOT EXISTS
steaphangreene May 13, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ported Working Set Size to 5.6
Summary:
Added a new DB level statistics tables.

Added statistics 'working_set_size' to above table.

Working set size is computed using a modified version of HyperLogLog
algorithm.

Sysbench results:

Without this change:
Transactions : 57.71 per sec
Read/Write requests : 1038.86 per sec

With this change:
Transactions : 57.05 per sec
Read/Write requests : 1027.24 per sec

Test Plan:
MTR tests included for correctness
Performance tested using Sysbench

Reviewers: steaphan, nponnekanti

Reviewed By: steaphan
  • Loading branch information
Rudradev Basak authored and steaphangreene committed Apr 19, 2013
commit f2c05a0aae36b82f1e37737c6b7dbb920f834d81
2 changes: 2 additions & 0 deletions mysql-test/r/information_schema-big.result
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ TABLESPACES TABLESPACE_NAME
TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
TABLE_PRIVILEGES TABLE_SCHEMA
TABLE_STATISTICS TABLE_SCHEMA
DB_STATISTICS DB
TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
USER_STATISTICS USER_NAME
Expand Down Expand Up @@ -97,6 +98,7 @@ TABLESPACES TABLESPACE_NAME
TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
TABLE_PRIVILEGES TABLE_SCHEMA
TABLE_STATISTICS TABLE_SCHEMA
DB_STATISTICS DB
TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
USER_STATISTICS USER_NAME
Expand Down
4 changes: 3 additions & 1 deletion mysql-test/r/information_schema.result
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ TABLESPACES
TABLE_CONSTRAINTS
TABLE_PRIVILEGES
TABLE_STATISTICS
DB_STATISTICS
TRIGGERS
USER_PRIVILEGES
USER_STATISTICS
Expand Down Expand Up @@ -904,7 +905,7 @@ table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest')
AND table_name not like 'ndb%' AND table_name not like 'innodb_%'
GROUP BY TABLE_SCHEMA;
table_schema count(*)
information_schema 33
information_schema 34
mysql 25
create table t1 (i int, j int);
create trigger trg1 before insert on t1 for each row
Expand Down Expand Up @@ -1349,6 +1350,7 @@ COLLATIONS information_schema.COLLATIONS 1
COLLATION_CHARACTER_SET_APPLICABILITY information_schema.COLLATION_CHARACTER_SET_APPLICABILITY 1
COLUMNS information_schema.COLUMNS 1
COLUMN_PRIVILEGES information_schema.COLUMN_PRIVILEGES 1
DB_STATISTICS information_schema.DB_STATISTICS 1
ENGINES information_schema.ENGINES 1
EVENTS information_schema.EVENTS 1
FILES information_schema.FILES 1
Expand Down
1 change: 1 addition & 0 deletions mysql-test/r/information_schema_db.result
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ TABLESPACES
TABLE_CONSTRAINTS
TABLE_PRIVILEGES
TABLE_STATISTICS
DB_STATISTICS
TRIGGERS
USER_PRIVILEGES
USER_STATISTICS
Expand Down
7 changes: 7 additions & 0 deletions mysql-test/r/mysqld--help-notwin.result
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ The following options may be given as the first argument:
client that does INSERT DELAYED will wait until there is
room in the queue again.This variable is deprecated along
with INSERT DELAYED.
--disable-working-set-size
Do not maintain working set size if on
--disconnect-on-expired-password
Give clients that don't signal password expiration
support execution time error(s) instead of connection
Expand Down Expand Up @@ -995,6 +997,9 @@ The following options may be given as the first argument:
-V, --version Output version information and exit.
--wait-timeout=# The number of seconds the server waits for activity on a
connection before closing it
--working-duration=#
The period of time for which we want working set size
statistics

Variables (--variable-name=value)
abort-slave-event-count 0
Expand Down Expand Up @@ -1038,6 +1043,7 @@ delay-key-write ON
delayed-insert-limit 100
delayed-insert-timeout 300
delayed-queue-size 1000
disable-working-set-size FALSE
disconnect-on-expired-password TRUE
disconnect-slave-event-count 0
div-precision-increment 4
Expand Down Expand Up @@ -1286,6 +1292,7 @@ updatable-views-with-limit YES
validate-user-plugins TRUE
verbose TRUE
wait-timeout 28800
working-duration 3600

To see what values a running MySQL server is using, type
'mysqladmin variables' instead of 'mysqld --verbose --help'.
2 changes: 2 additions & 0 deletions mysql-test/r/mysqlshow.result
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ Database: information_schema
| TABLE_CONSTRAINTS |
| TABLE_PRIVILEGES |
| TABLE_STATISTICS |
| DB_STATISTICS |
| TRIGGERS |
| USER_PRIVILEGES |
| USER_STATISTICS |
Expand Down Expand Up @@ -175,6 +176,7 @@ Database: INFORMATION_SCHEMA
| TABLE_CONSTRAINTS |
| TABLE_PRIVILEGES |
| TABLE_STATISTICS |
| DB_STATISTICS |
| TRIGGERS |
| USER_PRIVILEGES |
| USER_STATISTICS |
Expand Down
4 changes: 4 additions & 0 deletions mysql-test/suite/funcs_1/r/is_columns_is.result
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ def information_schema COLUMN_PRIVILEGES PRIVILEGE_TYPE 6 NO varchar 64 192 NUL
def information_schema COLUMN_PRIVILEGES TABLE_CATALOG 2 NO varchar 512 1536 NULL NULL NULL utf8 utf8_general_ci varchar(512) select
def information_schema COLUMN_PRIVILEGES TABLE_NAME 4 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select
def information_schema COLUMN_PRIVILEGES TABLE_SCHEMA 3 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select
def information_schema DB_STATISTICS DB 1 NO varchar 192 576 NULL NULL NULL utf8 utf8_general_ci varchar(192) select
def information_schema DB_STATISTICS WORKING_SET_SIZE 2 0 NO bigint NULL NULL 19 0 NULL NULL NULL bigint(21) select
def information_schema ENGINES COMMENT 3 NO varchar 80 240 NULL NULL NULL utf8 utf8_general_ci varchar(80) select
def information_schema ENGINES ENGINE 1 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select
def information_schema ENGINES SAVEPOINTS 6 NULL YES varchar 3 9 NULL NULL NULL utf8 utf8_general_ci varchar(3) select
Expand Down Expand Up @@ -562,6 +564,8 @@ NULL information_schema COLUMNS DATETIME_PRECISION bigint NULL NULL NULL NULL bi
3.0000 information_schema COLUMN_PRIVILEGES COLUMN_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)
3.0000 information_schema COLUMN_PRIVILEGES PRIVILEGE_TYPE varchar 64 192 utf8 utf8_general_ci varchar(64)
3.0000 information_schema COLUMN_PRIVILEGES IS_GRANTABLE varchar 3 9 utf8 utf8_general_ci varchar(3)
3.0000 information_schema DB_STATISTICS DB varchar 192 576 utf8 utf8_general_ci varchar(192)
NULL information_schema DB_STATISTICS WORKING_SET_SIZE bigint NULL NULL NULL NULL bigint(21)
3.0000 information_schema ENGINES ENGINE varchar 64 192 utf8 utf8_general_ci varchar(64)
3.0000 information_schema ENGINES SUPPORT varchar 8 24 utf8 utf8_general_ci varchar(8)
3.0000 information_schema ENGINES COMMENT varchar 80 240 utf8 utf8_general_ci varchar(80)
Expand Down
46 changes: 46 additions & 0 deletions mysql-test/suite/funcs_1/r/is_tables_is.result
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,29 @@ user_comment
Separator -----------------------------------------------------
TABLE_CATALOG def
TABLE_SCHEMA information_schema
TABLE_NAME DB_STATISTICS
TABLE_TYPE SYSTEM VIEW
ENGINE MEMORY
VERSION 10
ROW_FORMAT Fixed
TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL#
INDEX_LENGTH #IL#
DATA_FREE #DF#
AUTO_INCREMENT NULL
CREATE_TIME #CRT#
UPDATE_TIME #UT#
CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG def
TABLE_SCHEMA information_schema
TABLE_NAME ENGINES
TABLE_TYPE SYSTEM VIEW
ENGINE MEMORY
Expand Down Expand Up @@ -883,6 +906,29 @@ user_comment
Separator -----------------------------------------------------
TABLE_CATALOG def
TABLE_SCHEMA information_schema
TABLE_NAME DB_STATISTICS
TABLE_TYPE SYSTEM VIEW
ENGINE MEMORY
VERSION 10
ROW_FORMAT Fixed
TABLE_ROWS #TBLR#
AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL#
INDEX_LENGTH #IL#
DATA_FREE #DF#
AUTO_INCREMENT NULL
CREATE_TIME #CRT#
UPDATE_TIME #UT#
CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG def
TABLE_SCHEMA information_schema
TABLE_NAME ENGINES
TABLE_TYPE SYSTEM VIEW
ENGINE MEMORY
Expand Down
208 changes: 208 additions & 0 deletions mysql-test/suite/innodb/r/innodb_working_set_size_16k.result
Original file line number Diff line number Diff line change
@@ -0,0 +1,208 @@
drop table if exists t1;
drop table if exists t2;
set global DISABLE_WORKING_SET_SIZE = OFF;
set WORKING_DURATION = 300;
flush statistics;
create table t1 (i int primary key auto_increment) engine=innodb;
select working_set_size between 3 and 5
from information_schema.db_statistics
where db='test';
working_set_size between 3 and 5
1
insert into t1 values (1);
insert into t1 select NULL from t1;
insert into t1 select NULL from t1;
insert into t1 select NULL from t1;
insert into t1 select NULL from t1;
insert into t1 select NULL from t1;
insert into t1 select NULL from t1;
insert into t1 select NULL from t1;
insert into t1 select NULL from t1;
insert into t1 select NULL from t1;
insert into t1 select NULL from t1;
select count(*) from t1;
count(*)
1024
select working_set_size between 6 and 8
from information_schema.db_statistics
where db='test';
working_set_size between 6 and 8
1
insert into t1 select NULL from t1;
select count(*) from t1;
count(*)
2048
select working_set_size between 7 and 9
from information_schema.db_statistics
where db='test';
working_set_size between 7 and 9
1
insert into t1 select NULL from t1;
select count(*) from t1;
count(*)
4096
select working_set_size between 9 and 13
from information_schema.db_statistics
where db='test';
working_set_size between 9 and 13
1
insert into t1 select NULL from t1;
select count(*) from t1;
count(*)
8192
select working_set_size between 15 and 19
from information_schema.db_statistics
where db='test';
working_set_size between 15 and 19
1
insert into t1 select NULL from t1;
select count(*) from t1;
count(*)
16384
select working_set_size between 25 and 31
from information_schema.db_statistics
where db='test';
working_set_size between 25 and 31
1
insert into t1 select NULL from t1;
select count(*) from t1;
count(*)
32768
select working_set_size between 47 and 59
from information_schema.db_statistics
where db='test';
working_set_size between 47 and 59
1
insert into t1 select NULL from t1;
select count(*) from t1;
count(*)
65536
select working_set_size between 90 and 112
from information_schema.db_statistics
where db='test';
working_set_size between 90 and 112
1
insert into t1 select NULL from t1;
select count(*) from t1;
count(*)
131072
select working_set_size between 179 and 219
from information_schema.db_statistics
where db='test';
working_set_size between 179 and 219
1
insert into t1 select NULL from t1;
select count(*) from t1;
count(*)
262144
select working_set_size between 357 and 437
from information_schema.db_statistics
where db='test';
working_set_size between 357 and 437
1
create table t2 (i int primary key auto_increment)
key_block_size=8 engine=innodb;
select working_set_size between 360 and 442
from information_schema.db_statistics
where db='test';
working_set_size between 360 and 442
1
insert into t2 values (1);
insert into t2 select NULL from t2;
insert into t2 select NULL from t2;
insert into t2 select NULL from t2;
insert into t2 select NULL from t2;
insert into t2 select NULL from t2;
insert into t2 select NULL from t2;
insert into t2 select NULL from t2;
insert into t2 select NULL from t2;
insert into t2 select NULL from t2;
insert into t2 select NULL from t2;
select count(*) from t2;
count(*)
1024
select working_set_size between 365 and 447
from information_schema.db_statistics
where db='test';
working_set_size between 365 and 447
1
insert into t2 select NULL from t2;
select count(*) from t2;
count(*)
2048
select working_set_size between 368 and 450
from information_schema.db_statistics
where db='test';
working_set_size between 368 and 450
1
insert into t2 select NULL from t2;
select count(*) from t2;
count(*)
4096
select working_set_size between 370 and 454
from information_schema.db_statistics
where db='test';
working_set_size between 370 and 454
1
insert into t2 select NULL from t2;
select count(*) from t2;
count(*)
8192
select working_set_size between 377 and 461
from information_schema.db_statistics
where db='test';
working_set_size between 377 and 461
1
insert into t2 select NULL from t2;
select count(*) from t2;
count(*)
16384
select working_set_size between 393 and 481
from information_schema.db_statistics
where db='test';
working_set_size between 393 and 481
1
insert into t2 select NULL from t2;
select count(*) from t2;
count(*)
32768
select working_set_size between 428 and 524
from information_schema.db_statistics
where db='test';
working_set_size between 428 and 524
1
insert into t2 select NULL from t2;
select count(*) from t2;
count(*)
65536
select working_set_size between 489 and 599
from information_schema.db_statistics
where db='test';
working_set_size between 489 and 599
1
insert into t2 select NULL from t2;
select count(*) from t2;
count(*)
131072
select working_set_size between 604 and 740
from information_schema.db_statistics
where db='test';
working_set_size between 604 and 740
1
insert into t2 select NULL from t2;
select count(*) from t2;
count(*)
262144
select working_set_size between 837 and 1023
from information_schema.db_statistics
where db='test';
working_set_size between 837 and 1023
1
flush statistics;
select working_set_size from information_schema.db_statistics
where db='test';
working_set_size
0
drop table t1;
drop table t2;
SET GLOBAL disable_working_set_size = 0;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--innodb_file_per_table --innodb_file_format=barracuda
Loading