[Commits] Rev 2834: fixes for buildbot in http://bazaar.launchpad.net/~maria-captains/maria/5.2/

serg at askmonty.org serg at askmonty.org
Sun Jul 25 18:23:43 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2834
revision-id: sergii at pisem.net-20100725152338-7v3j4q3mels2zxe3
parent: sergii at pisem.net-20100725150921-prgjus1964onmk8b
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.2
timestamp: Sun 2010-07-25 17:23:38 +0200
message:
  fixes for buildbot
-------------- next part --------------
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_is.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result	2010-06-01 19:52:20 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result	2010-07-25 15:23:38 +0000
@@ -7,29 +7,29 @@ NULL	information_schema	CHARACTER_SETS	C
 NULL    information_schema      CHARACTER_SETS  DEFAULT_COLLATE_NAME    2               NO      varchar 32      96      NULL    NULL    utf8    utf8_general_ci varchar(32)                     select  
 NULL    information_schema      CHARACTER_SETS  DESCRIPTION     3               NO      varchar 60      180     NULL    NULL    utf8    utf8_general_ci varchar(60)                     select  
 NULL    information_schema      CHARACTER_SETS  MAXLEN  4       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(3)                       select  
-NULL    information_schema      CLIENT_STATISTICS       ACCESS_DENIED   22      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       BINLOG_BYTES_WRITTEN    9       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
+NULL    information_schema      CLIENT_STATISTICS       ACCESS_DENIED   22      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       BINLOG_BYTES_WRITTEN    9       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
 NULL    information_schema      CLIENT_STATISTICS       BUSY_TIME       5       0       NO      double  NULL    NULL    21      NULL    NULL    NULL    double                  select  
-NULL    information_schema      CLIENT_STATISTICS       BYTES_RECEIVED  7       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       BYTES_SENT      8       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
+NULL    information_schema      CLIENT_STATISTICS       BYTES_RECEIVED  7       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       BYTES_SENT      8       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
 NULL    information_schema      CLIENT_STATISTICS       CLIENT  1               NO      varchar 64      192     NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
-NULL    information_schema      CLIENT_STATISTICS       COMMIT_TRANSACTIONS     18      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       CONCURRENT_CONNECTIONS  3       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       CONNECTED_TIME  4       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
+NULL    information_schema      CLIENT_STATISTICS       COMMIT_TRANSACTIONS     18      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       CONCURRENT_CONNECTIONS  3       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       CONNECTED_TIME  4       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
 NULL    information_schema      CLIENT_STATISTICS       CPU_TIME        6       0       NO      double  NULL    NULL    21      NULL    NULL    NULL    double                  select  
-NULL    information_schema      CLIENT_STATISTICS       DENIED_CONNECTIONS      20      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       EMPTY_QUERIES   23      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       LOST_CONNECTIONS        21      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       OTHER_COMMANDS  17      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       ROLLBACK_TRANSACTIONS   19      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       ROWS_DELETED    12      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       ROWS_INSERTED   13      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       ROWS_READ       10      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       ROWS_SENT       11      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       ROWS_UPDATED    14      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       SELECT_COMMANDS 15      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       TOTAL_CONNECTIONS       2       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      CLIENT_STATISTICS       UPDATE_COMMANDS 16      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
+NULL    information_schema      CLIENT_STATISTICS       DENIED_CONNECTIONS      20      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       EMPTY_QUERIES   23      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       LOST_CONNECTIONS        21      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       OTHER_COMMANDS  17      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       ROLLBACK_TRANSACTIONS   19      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       ROWS_DELETED    12      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       ROWS_INSERTED   13      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       ROWS_READ       10      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       ROWS_SENT       11      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       ROWS_UPDATED    14      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       SELECT_COMMANDS 15      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       TOTAL_CONNECTIONS       2       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      CLIENT_STATISTICS       UPDATE_COMMANDS 16      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
 NULL    information_schema      COLLATIONS      CHARACTER_SET_NAME      2               NO      varchar 32      96      NULL    NULL    utf8    utf8_general_ci varchar(32)                     select  
 NULL    information_schema      COLLATIONS      COLLATION_NAME  1               NO      varchar 32      96      NULL    NULL    utf8    utf8_general_ci varchar(32)                     select  
 NULL    information_schema      COLLATIONS      ID      3       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(11)                      select  
@@ -137,7 +137,7 @@ NULL	information_schema	GLOBAL_STATUS	VA
 NULL    information_schema      GLOBAL_VARIABLES        VARIABLE_NAME   1               NO      varchar 64      192     NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
 NULL    information_schema      GLOBAL_VARIABLES        VARIABLE_VALUE  2       NULL    YES     varchar 1024    3072    NULL    NULL    utf8    utf8_general_ci varchar(1024)                   select  
 NULL    information_schema      INDEX_STATISTICS        INDEX_NAME      3               NO      varchar 192     576     NULL    NULL    utf8    utf8_general_ci varchar(192)                    select  
-NULL    information_schema      INDEX_STATISTICS        ROWS_READ       4       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
+NULL    information_schema      INDEX_STATISTICS        ROWS_READ       4       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
 NULL    information_schema      INDEX_STATISTICS        TABLE_NAME      2               NO      varchar 192     576     NULL    NULL    utf8    utf8_general_ci varchar(192)                    select  
 NULL    information_schema      INDEX_STATISTICS        TABLE_SCHEMA    1               NO      varchar 192     576     NULL    NULL    utf8    utf8_general_ci varchar(192)                    select  
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        fix_count       5       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21) unsigned                     select  
@@ -416,9 +416,9 @@ NULL	information_schema	TABLE_PRIVILEGES
 NULL    information_schema      TABLE_PRIVILEGES        TABLE_CATALOG   2       NULL    YES     varchar 512     1536    NULL    NULL    utf8    utf8_general_ci varchar(512)                    select  
 NULL    information_schema      TABLE_PRIVILEGES        TABLE_NAME      4               NO      varchar 64      192     NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
 NULL    information_schema      TABLE_PRIVILEGES        TABLE_SCHEMA    3               NO      varchar 64      192     NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
-NULL    information_schema      TABLE_STATISTICS        ROWS_CHANGED    4       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      TABLE_STATISTICS        ROWS_CHANGED_X_INDEXES  5       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      TABLE_STATISTICS        ROWS_READ       3       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
+NULL    information_schema      TABLE_STATISTICS        ROWS_CHANGED    4       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      TABLE_STATISTICS        ROWS_CHANGED_X_INDEXES  5       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      TABLE_STATISTICS        ROWS_READ       3       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
 NULL    information_schema      TABLE_STATISTICS        TABLE_NAME      2               NO      varchar 192     576     NULL    NULL    utf8    utf8_general_ci varchar(192)                    select  
 NULL    information_schema      TABLE_STATISTICS        TABLE_SCHEMA    1               NO      varchar 192     576     NULL    NULL    utf8    utf8_general_ci varchar(192)                    select  
 NULL    information_schema      TRIGGERS        ACTION_CONDITION        9       NULL    YES     longtext        4294967295      4294967295      NULL    NULL    utf8    utf8_general_ci longtext                        select  
@@ -447,28 +447,28 @@ NULL	information_schema	USER_PRIVILEGES	
 NULL    information_schema      USER_PRIVILEGES IS_GRANTABLE    4               NO      varchar 3       9       NULL    NULL    utf8    utf8_general_ci varchar(3)                      select  
 NULL    information_schema      USER_PRIVILEGES PRIVILEGE_TYPE  3               NO      varchar 64      192     NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
 NULL    information_schema      USER_PRIVILEGES TABLE_CATALOG   2       NULL    YES     varchar 512     1536    NULL    NULL    utf8    utf8_general_ci varchar(512)                    select  
-NULL    information_schema      USER_STATISTICS ACCESS_DENIED   22      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS BINLOG_BYTES_WRITTEN    9       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
+NULL    information_schema      USER_STATISTICS ACCESS_DENIED   22      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS BINLOG_BYTES_WRITTEN    9       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
 NULL    information_schema      USER_STATISTICS BUSY_TIME       5       0       NO      double  NULL    NULL    21      NULL    NULL    NULL    double                  select  
-NULL    information_schema      USER_STATISTICS BYTES_RECEIVED  7       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS BYTES_SENT      8       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS COMMIT_TRANSACTIONS     18      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS CONCURRENT_CONNECTIONS  3       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS CONNECTED_TIME  4       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
+NULL    information_schema      USER_STATISTICS BYTES_RECEIVED  7       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS BYTES_SENT      8       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS COMMIT_TRANSACTIONS     18      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS CONCURRENT_CONNECTIONS  3       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(11)                 select  
+NULL    information_schema      USER_STATISTICS CONNECTED_TIME  4       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(11)                 select  
 NULL    information_schema      USER_STATISTICS CPU_TIME        6       0       NO      double  NULL    NULL    21      NULL    NULL    NULL    double                  select  
-NULL    information_schema      USER_STATISTICS DENIED_CONNECTIONS      20      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS EMPTY_QUERIES   23      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS LOST_CONNECTIONS        21      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS OTHER_COMMANDS  17      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS ROLLBACK_TRANSACTIONS   19      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS ROWS_DELETED    12      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS ROWS_INSERTED   13      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS ROWS_READ       10      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS ROWS_SENT       11      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS ROWS_UPDATED    14      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS SELECT_COMMANDS 15      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS TOTAL_CONNECTIONS       2       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
-NULL    information_schema      USER_STATISTICS UPDATE_COMMANDS 16      0       NO      int     NULL    NULL    10      0       NULL    NULL    int(21)                 select  
+NULL    information_schema      USER_STATISTICS DENIED_CONNECTIONS      20      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS EMPTY_QUERIES   23      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS LOST_CONNECTIONS        21      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS OTHER_COMMANDS  17      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS ROLLBACK_TRANSACTIONS   19      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS ROWS_DELETED    12      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS ROWS_INSERTED   13      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS ROWS_READ       10      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS ROWS_SENT       11      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS ROWS_UPDATED    14      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS SELECT_COMMANDS 15      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
+NULL    information_schema      USER_STATISTICS TOTAL_CONNECTIONS       2       0       NO      int     NULL    NULL    10      0       NULL    NULL    int(11)                 select  
+NULL    information_schema      USER_STATISTICS UPDATE_COMMANDS 16      0       NO      bigint  NULL    NULL    19      0       NULL    NULL    bigint(21)                      select  
 NULL    information_schema      USER_STATISTICS USER    1               NO      varchar 48      144     NULL    NULL    utf8    utf8_general_ci varchar(48)                     select  
 NULL    information_schema      VIEWS   CHARACTER_SET_CLIENT    9               NO      varchar 32      96      NULL    NULL    utf8    utf8_general_ci varchar(32)                     select  
 NULL    information_schema      VIEWS   CHECK_OPTION    5               NO      varchar 8       24      NULL    NULL    utf8    utf8_general_ci varchar(8)                      select  
@@ -550,28 +550,28 @@ COL_CML	TABLE_SCHEMA	TABLE_NAME	COLUMN_N
 3.0000  information_schema      CHARACTER_SETS  DESCRIPTION     varchar 60      180     utf8    utf8_general_ci varchar(60)
 NULL    information_schema      CHARACTER_SETS  MAXLEN  bigint  NULL    NULL    NULL    NULL    bigint(3)
 3.0000  information_schema      CLIENT_STATISTICS       CLIENT  varchar 64      192     utf8    utf8_general_ci varchar(64)
-NULL    information_schema      CLIENT_STATISTICS       TOTAL_CONNECTIONS       int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       CONCURRENT_CONNECTIONS  int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       CONNECTED_TIME  int     NULL    NULL    NULL    NULL    int(21)
+NULL    information_schema      CLIENT_STATISTICS       TOTAL_CONNECTIONS       bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       CONCURRENT_CONNECTIONS  bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       CONNECTED_TIME  bigint  NULL    NULL    NULL    NULL    bigint(21)
 NULL    information_schema      CLIENT_STATISTICS       BUSY_TIME       double  NULL    NULL    NULL    NULL    double
 NULL    information_schema      CLIENT_STATISTICS       CPU_TIME        double  NULL    NULL    NULL    NULL    double
-NULL    information_schema      CLIENT_STATISTICS       BYTES_RECEIVED  int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       BYTES_SENT      int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       BINLOG_BYTES_WRITTEN    int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       ROWS_READ       int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       ROWS_SENT       int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       ROWS_DELETED    int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       ROWS_INSERTED   int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       ROWS_UPDATED    int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       SELECT_COMMANDS int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       UPDATE_COMMANDS int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       OTHER_COMMANDS  int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       COMMIT_TRANSACTIONS     int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       ROLLBACK_TRANSACTIONS   int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       DENIED_CONNECTIONS      int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       LOST_CONNECTIONS        int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       ACCESS_DENIED   int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      CLIENT_STATISTICS       EMPTY_QUERIES   int     NULL    NULL    NULL    NULL    int(21)
+NULL    information_schema      CLIENT_STATISTICS       BYTES_RECEIVED  bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       BYTES_SENT      bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       BINLOG_BYTES_WRITTEN    bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       ROWS_READ       bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       ROWS_SENT       bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       ROWS_DELETED    bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       ROWS_INSERTED   bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       ROWS_UPDATED    bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       SELECT_COMMANDS bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       UPDATE_COMMANDS bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       OTHER_COMMANDS  bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       COMMIT_TRANSACTIONS     bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       ROLLBACK_TRANSACTIONS   bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       DENIED_CONNECTIONS      bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       LOST_CONNECTIONS        bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       ACCESS_DENIED   bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      CLIENT_STATISTICS       EMPTY_QUERIES   bigint  NULL    NULL    NULL    NULL    bigint(21)
 3.0000  information_schema      COLLATIONS      COLLATION_NAME  varchar 32      96      utf8    utf8_general_ci varchar(32)
 3.0000  information_schema      COLLATIONS      CHARACTER_SET_NAME      varchar 32      96      utf8    utf8_general_ci varchar(32)
 NULL    information_schema      COLLATIONS      ID      bigint  NULL    NULL    NULL    NULL    bigint(11)
@@ -681,7 +681,7 @@ NULL	information_schema	FILES	CHECKSUM	b
 3.0000  information_schema      INDEX_STATISTICS        TABLE_SCHEMA    varchar 192     576     utf8    utf8_general_ci varchar(192)
 3.0000  information_schema      INDEX_STATISTICS        TABLE_NAME      varchar 192     576     utf8    utf8_general_ci varchar(192)
 3.0000  information_schema      INDEX_STATISTICS        INDEX_NAME      varchar 192     576     utf8    utf8_general_ci varchar(192)
-NULL    information_schema      INDEX_STATISTICS        ROWS_READ       int     NULL    NULL    NULL    NULL    int(21)
+NULL    information_schema      INDEX_STATISTICS        ROWS_READ       bigint  NULL    NULL    NULL    NULL    bigint(21)
 3.0000  information_schema      INNODB_BUFFER_POOL_PAGES        page_type       varchar 64      192     utf8    utf8_general_ci varchar(64)
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        space_id        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        page_no bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
@@ -960,9 +960,9 @@ NULL	information_schema	TABLES	CHECKSUM	
 3.0000  information_schema      TABLE_PRIVILEGES        IS_GRANTABLE    varchar 3       9       utf8    utf8_general_ci varchar(3)
 3.0000  information_schema      TABLE_STATISTICS        TABLE_SCHEMA    varchar 192     576     utf8    utf8_general_ci varchar(192)
 3.0000  information_schema      TABLE_STATISTICS        TABLE_NAME      varchar 192     576     utf8    utf8_general_ci varchar(192)
-NULL    information_schema      TABLE_STATISTICS        ROWS_READ       int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      TABLE_STATISTICS        ROWS_CHANGED    int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      TABLE_STATISTICS        ROWS_CHANGED_X_INDEXES  int     NULL    NULL    NULL    NULL    int(21)
+NULL    information_schema      TABLE_STATISTICS        ROWS_READ       bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      TABLE_STATISTICS        ROWS_CHANGED    bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      TABLE_STATISTICS        ROWS_CHANGED_X_INDEXES  bigint  NULL    NULL    NULL    NULL    bigint(21)
 3.0000  information_schema      TRIGGERS        TRIGGER_CATALOG varchar 512     1536    utf8    utf8_general_ci varchar(512)
 3.0000  information_schema      TRIGGERS        TRIGGER_SCHEMA  varchar 64      192     utf8    utf8_general_ci varchar(64)
 3.0000  information_schema      TRIGGERS        TRIGGER_NAME    varchar 64      192     utf8    utf8_general_ci varchar(64)
@@ -990,28 +990,28 @@ NULL	information_schema	TRIGGERS	CREATED
 3.0000  information_schema      USER_PRIVILEGES PRIVILEGE_TYPE  varchar 64      192     utf8    utf8_general_ci varchar(64)
 3.0000  information_schema      USER_PRIVILEGES IS_GRANTABLE    varchar 3       9       utf8    utf8_general_ci varchar(3)
 3.0000  information_schema      USER_STATISTICS USER    varchar 48      144     utf8    utf8_general_ci varchar(48)
-NULL    information_schema      USER_STATISTICS TOTAL_CONNECTIONS       int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS CONCURRENT_CONNECTIONS  int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS CONNECTED_TIME  int     NULL    NULL    NULL    NULL    int(21)
+NULL    information_schema      USER_STATISTICS TOTAL_CONNECTIONS       int     NULL    NULL    NULL    NULL    int(11)
+NULL    information_schema      USER_STATISTICS CONCURRENT_CONNECTIONS  int     NULL    NULL    NULL    NULL    int(11)
+NULL    information_schema      USER_STATISTICS CONNECTED_TIME  int     NULL    NULL    NULL    NULL    int(11)
 NULL    information_schema      USER_STATISTICS BUSY_TIME       double  NULL    NULL    NULL    NULL    double
 NULL    information_schema      USER_STATISTICS CPU_TIME        double  NULL    NULL    NULL    NULL    double
-NULL    information_schema      USER_STATISTICS BYTES_RECEIVED  int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS BYTES_SENT      int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS BINLOG_BYTES_WRITTEN    int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS ROWS_READ       int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS ROWS_SENT       int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS ROWS_DELETED    int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS ROWS_INSERTED   int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS ROWS_UPDATED    int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS SELECT_COMMANDS int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS UPDATE_COMMANDS int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS OTHER_COMMANDS  int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS COMMIT_TRANSACTIONS     int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS ROLLBACK_TRANSACTIONS   int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS DENIED_CONNECTIONS      int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS LOST_CONNECTIONS        int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS ACCESS_DENIED   int     NULL    NULL    NULL    NULL    int(21)
-NULL    information_schema      USER_STATISTICS EMPTY_QUERIES   int     NULL    NULL    NULL    NULL    int(21)
+NULL    information_schema      USER_STATISTICS BYTES_RECEIVED  bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS BYTES_SENT      bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS BINLOG_BYTES_WRITTEN    bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS ROWS_READ       bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS ROWS_SENT       bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS ROWS_DELETED    bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS ROWS_INSERTED   bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS ROWS_UPDATED    bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS SELECT_COMMANDS bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS UPDATE_COMMANDS bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS OTHER_COMMANDS  bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS COMMIT_TRANSACTIONS     bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS ROLLBACK_TRANSACTIONS   bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS DENIED_CONNECTIONS      bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS LOST_CONNECTIONS        bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS ACCESS_DENIED   bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      USER_STATISTICS EMPTY_QUERIES   bigint  NULL    NULL    NULL    NULL    bigint(21)
 3.0000  information_schema      VIEWS   TABLE_CATALOG   varchar 512     1536    utf8    utf8_general_ci varchar(512)
 3.0000  information_schema      VIEWS   TABLE_SCHEMA    varchar 64      192     utf8    utf8_general_ci varchar(64)
 3.0000  information_schema      VIEWS   TABLE_NAME      varchar 64      192     utf8    utf8_general_ci varchar(64)

=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2010-07-19 18:53:28 +0000
+++ b/mysql-test/valgrind.supp	2010-07-25 15:23:38 +0000
@@ -544,8 +544,6 @@
    Memcheck:Leak
    fun:malloc
    fun:_dl_signal_error
-   fun:_dl_signal_error
-   fun:_dl_lookup_symbol_x
 }
 
 #

=== modified file 'scripts/make_win_bin_dist'
--- a/scripts/make_win_bin_dist	2010-05-12 14:27:18 +0000
+++ b/scripts/make_win_bin_dist	2010-07-25 15:23:38 +0000
@@ -163,7 +163,7 @@ if [ -f "storage/pbxt/bin/xtstat.exe" ] 
   cp storage/pbxt/bin/xtstat.{exe,pdb} $DESTDIR/bin
 fi
 
-cp server-tools/instance-manager/$TARGET/*.{exe,map}     $DESTDIR/bin/
+cp server-tools/instance-manager/$TARGET/*.exe           $DESTDIR/bin/
 if [ x"$TARGET" != x"release" ] ; then
   cp server-tools/instance-manager/$TARGET/*.pdb         $DESTDIR/bin/
   cp client/$TARGET/mysql.pdb                            $DESTDIR/bin/
@@ -361,7 +361,7 @@ cp -R mysql-test/{t,r,include,suite,std_
 
 rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_kill.{dir,vcproj}
 rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_process.{dir,vcproj}
-rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/{Debug,RelWithDebInfo}/*.{ilk,idb,map}
+rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/{Debug,RelWithDebInfo}/*.{ilk,idb}
 
 
 # Note that this will not copy "extra" if a soft link

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-07-09 11:39:19 +0000
+++ b/sql/CMakeLists.txt	2010-07-25 15:23:38 +0000
@@ -18,6 +18,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG 
     "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
 SET(CMAKE_C_FLAGS_DEBUG 
     "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include 



More information about the commits mailing list