bzr push into mysql-trunk branch (chris.powers:3177 to 3178) Bug#11766504

[Christopher Powers]

 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');


Attachment: [text/bzr-bundle] bzr/[e-mail]