From: Christopher Powers Date: June 9 2011 10:28pm Subject: bzr push into mysql-trunk branch (chris.powers:3177 to 3178) Bug#11766504 List-Archive: http://lists.mysql.com/commits/139016 X-Bug: 11766504 Message-Id: <20110609222811.0EC3E1DB033E@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5171028463310732865==" --===============5171028463310732865== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3178 cpowers 2011-06-09 Bug#11766504 "BIGINT UNSIGNED BYTE RELATED COLUMNS IN PERFORMANCE_SCHEMA" - Used signed BIGINT for byte count columns modified: mysql-test/suite/perfschema/r/schema.result scripts/mysql_system_tables.sql 3177 Dmitry Shulga 2011-06-10 [merge] Auto-merge of patch and follow-up for bug#11764334 from mysql-5.5 tree. modified: mysql-test/r/events_bugs.result mysql-test/t/events_bugs.test sql/event_db_repository.cc sql/event_parse_data.cc sql/event_parse_data.h sql/sql_yacc.yy === modified file 'mysql-test/suite/perfschema/r/schema.result' --- a/mysql-test/suite/perfschema/r/schema.result 2011-05-17 09:15:47 +0000 +++ b/mysql-test/suite/perfschema/r/schema.result 2011-06-09 21:45:47 +0000 @@ -307,7 +307,7 @@ events_waits_current CREATE TABLE `event `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL, `OPERATION` varchar(32) NOT NULL, - `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL, + `NUMBER_OF_BYTES` bigint(20) DEFAULT NULL, `FLAGS` int(10) unsigned DEFAULT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table events_waits_history; @@ -329,7 +329,7 @@ events_waits_history CREATE TABLE `event `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL, `OPERATION` varchar(32) NOT NULL, - `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL, + `NUMBER_OF_BYTES` bigint(20) DEFAULT NULL, `FLAGS` int(10) unsigned DEFAULT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table events_waits_history_long; @@ -351,7 +351,7 @@ events_waits_history_long CREATE TABLE ` `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL, `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL, `OPERATION` varchar(32) NOT NULL, - `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL, + `NUMBER_OF_BYTES` bigint(20) DEFAULT NULL, `FLAGS` int(10) unsigned DEFAULT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table events_waits_summary_by_instance; @@ -399,8 +399,8 @@ file_summary_by_event_name CREATE TABLE `EVENT_NAME` varchar(128) NOT NULL, `COUNT_READ` bigint(20) unsigned NOT NULL, `COUNT_WRITE` bigint(20) unsigned NOT NULL, - `SUM_NUMBER_OF_BYTES_READ` bigint(20) unsigned NOT NULL, - `SUM_NUMBER_OF_BYTES_WRITE` bigint(20) unsigned NOT NULL + `SUM_NUMBER_OF_BYTES_READ` bigint(20) NOT NULL, + `SUM_NUMBER_OF_BYTES_WRITE` bigint(20) NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table file_summary_by_instance; Table Create Table @@ -409,8 +409,8 @@ file_summary_by_instance CREATE TABLE `f `EVENT_NAME` varchar(128) NOT NULL, `COUNT_READ` bigint(20) unsigned NOT NULL, `COUNT_WRITE` bigint(20) unsigned NOT NULL, - `SUM_NUMBER_OF_BYTES_READ` bigint(20) unsigned NOT NULL, - `SUM_NUMBER_OF_BYTES_WRITE` bigint(20) unsigned NOT NULL + `SUM_NUMBER_OF_BYTES_READ` bigint(20) NOT NULL, + `SUM_NUMBER_OF_BYTES_WRITE` bigint(20) NOT NULL ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8 show create table mutex_instances; Table Create Table === modified file 'scripts/mysql_system_tables.sql' --- a/scripts/mysql_system_tables.sql 2011-05-05 22:46:07 +0000 +++ b/scripts/mysql_system_tables.sql 2011-06-09 21:45:47 +0000 @@ -204,7 +204,7 @@ SET @cmd="CREATE TABLE performance_schem "NESTING_EVENT_ID BIGINT unsigned," "NESTING_EVENT_TYPE ENUM('STATEMENT', 'STAGE', 'WAIT')," "OPERATION VARCHAR(32) not null," - "NUMBER_OF_BYTES BIGINT unsigned," + "NUMBER_OF_BYTES BIGINT," "FLAGS INTEGER unsigned" ")ENGINE=PERFORMANCE_SCHEMA;"; @@ -234,7 +234,7 @@ SET @cmd="CREATE TABLE performance_schem "NESTING_EVENT_ID BIGINT unsigned," "NESTING_EVENT_TYPE ENUM('STATEMENT', 'STAGE', 'WAIT')," "OPERATION VARCHAR(32) not null," - "NUMBER_OF_BYTES BIGINT unsigned," + "NUMBER_OF_BYTES BIGINT," "FLAGS INTEGER unsigned" ")ENGINE=PERFORMANCE_SCHEMA;"; @@ -264,7 +264,7 @@ SET @cmd="CREATE TABLE performance_schem "NESTING_EVENT_ID BIGINT unsigned," "NESTING_EVENT_TYPE ENUM('STATEMENT', 'STAGE', 'WAIT')," "OPERATION VARCHAR(32) not null," - "NUMBER_OF_BYTES BIGINT unsigned," + "NUMBER_OF_BYTES BIGINT," "FLAGS INTEGER unsigned" ")ENGINE=PERFORMANCE_SCHEMA;"; @@ -352,8 +352,8 @@ SET @cmd="CREATE TABLE performance_schem "EVENT_NAME VARCHAR(128) not null," "COUNT_READ BIGINT unsigned not null," "COUNT_WRITE BIGINT unsigned not null," - "SUM_NUMBER_OF_BYTES_READ BIGINT unsigned not null," - "SUM_NUMBER_OF_BYTES_WRITE BIGINT unsigned not null" + "SUM_NUMBER_OF_BYTES_READ BIGINT not null," + "SUM_NUMBER_OF_BYTES_WRITE BIGINT not null" ")ENGINE=PERFORMANCE_SCHEMA;"; SET @str = IF(@have_pfs = 1, @cmd, 'SET @dummy = 0'); @@ -370,8 +370,8 @@ SET @cmd="CREATE TABLE performance_schem "EVENT_NAME VARCHAR(128) not null," "COUNT_READ BIGINT unsigned not null," "COUNT_WRITE BIGINT unsigned not null," - "SUM_NUMBER_OF_BYTES_READ BIGINT unsigned not null," - "SUM_NUMBER_OF_BYTES_WRITE BIGINT unsigned not null" + "SUM_NUMBER_OF_BYTES_READ BIGINT not null," + "SUM_NUMBER_OF_BYTES_WRITE BIGINT not null" ")ENGINE=PERFORMANCE_SCHEMA;"; SET @str = IF(@have_pfs = 1, @cmd, 'SET @dummy = 0'); --===============5171028463310732865== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/cpowers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: cpowers@tma-1-20110609214547-uutgd1bfzoz8oqi1 # target_branch: file:///home/cpowers/work/dev/mysql-trunk-bigint/ # testament_sha1: b013d3e0d273ff255c678332963a29934636e1d1 # timestamp: 2011-06-09 17:28:10 -0500 # base_revision_id: dmitry.shulga@stripped\ # 31azhx0e1qg3msyn # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXD+AuEAAqJfgAAQWGf/93/n 3qD////wUAW+di7utOzWwuUNaso3hJSZT01MImMI00mT1MT1E0yYmAIaaGQSiTU2JPEBQZNAAAAA AAASKJk0QamyU9TNoKbSPU9QABkA0ADmjJiYAJiMCNMCDEYJkwCMEkgmhlNMmp6aRkg02ppoGgBo Gj0IHTwzerExzDz8X91Zi9yYkOTisterdWnOIIfLXBSMs5WVM91IQYSdglLQe8oMzJmQfn6oO2FU 4A8yO5wzwhlZBYygVVwIOY6ThUnVX+ezicT0pmpQYdSXRgi2VJdyXvT5J/5+MWkcDwjahzA59i9h hTZdbI9uDRaW6+dDaQIkH5kSbxwS5EUKc2+oG2jcfQ0fvEMDIBprW+s1b5cP6PblIcUtErgJCuK2 5FSgnmkxtkXm7PNKLTaB4JQ2RiZmAOEPJnNBQ6bjJQbVUV7EQUbAteQGK1EGQByWvHH6joU1GPPJ E8xegoMnLygMXm+ntuLklsMK6gDI6mhGqPFjtlrJoyI6D71gwoAl/k9kcpNViU91cazp2y6xplI2 p9SC1xfpNg4eceOpW6cA16CGS9yThBhUtvG4sA0K2RQNMLpEmqKOW94wc2KGYpfaYYOdUq33SKGy uZRUyBsgHaxuytHm6ZshO06Vqhplea2ZpKYwMVDs2owEFlg+rG+krUFttC0gWjaE85B+HduxOQdI t0V4kdIwzPDdSXQOekBkqpFSsiVLAtJzp1FmVsOI3Z0yqIvMSIZbDOjGE9FaSA4yYxsUuiGbE+8V lc5sYxtCoCliOyFjhxYWPfYWm3sX0XXBUV1lNoxcRfOhpZVpw5XBKLFCE2KajEs/wFLikRgwUBRW OItK8HkaJkidDiKxTG+E5SSlaVcPhQjZRB2OamiVju8a403t6y6DbWPvJeI58VAD6nrB9X2V1GZM zQEp6UHeJV9Hx+cfcRHJx71wCkn9ah2cN4lES7GJqrgJcBEakF13BBINaVnaItdOMEkTwrsDKMUD 0slkB2JhK/ZkFUAa7uC9yAjFrCwYYgkRMExFBM772EnHfBKCYSq4gMxlDuJK4SvA0iUwzsOHVi2L d2xDzr2qtUN5jSckXHLhF1nSuryTTs6TGu08/FEDAqPDDFS9Hh6ZyZzMuadL1iWrrVHd2Lt8CQe4 7yQ0uQWpeka8+/44X+KSs1WwvLvlHeRJF/BmnNXiaDGG1Rg0c21GEH/Pme5MjMhxZTROsrxhQVw9 d4FFea2kIAzA5Etb9zeNZk1/MbJ9zUEg2bIiom5HV8RvM9JOyKcmRsm2k+Kd2ixjnMmidLYyf/RD 1MtqvTAtdmn+RFtCjsqIgIIi4C/Pqq0nCPHlMV48ssL3q3JkW4uN5DXgGrJMW5RuYC/5U6zA14io B4GmUNwpUet+83khpLxLJC5r0pjQ1wGVb+pDI9qqKwJ9QsBZ7I4LwPfXndhRwTWI3A43fvll26ns w7qIToa2PEMiIwCK4G8tQw6F3r02FDAw0zipmVgDE5qgRSGlVQke9bkzUc+GQgXDFvLJI4GLlGzL WHEzxklzJtNhIILp2d+0/XLbIv85t2bkqI6MSR0gWdaOVDlNy5wvnARyTAzvDLlYYHquwrsEbKnG HTkqwJobR4ORYEBGcUHUqcL1TjdytWY1SwrEa3OTGnrhE0uLYEaX+h0n28+gIaDUsNCHlA5Yzo2t /MES4cqIcmv1G1UWeHEHlckw28g484VLPnuhGC4tYW+ECc6abzxgWomHHxrGUAfDL27DT41IH2qF mh94FoHO/oIOGsXh2oZ2eERdfjWaCHYrmIj5Tocasa2AxQ5oAW6LFEr8VgA+gu5IpwoSDh/AXCA= --===============5171028463310732865==--