mysql-userstats-testsuite.patch

   1 diff -r 0029211e0356 mysql-test/r/information_schema.result
   2 --- a/mysql-test/r/information_schema.result    Mon Sep 08 16:38:54 2008 -0700
   3 +++ b/mysql-test/r/information_schema.result    Mon Sep 08 16:39:00 2008 -0700
   4 @@ -41,6 +41,7 @@
   5  COLLATION_CHARACTER_SET_APPLICABILITY
   6  COLUMNS
   7  COLUMN_PRIVILEGES
   8 +INDEX_STATISTICS
   9  KEY_COLUMN_USAGE
  10  ROUTINES
  11  SCHEMATA
  12 @@ -49,8 +50,10 @@
  13  TABLES
  14  TABLE_CONSTRAINTS
  15  TABLE_PRIVILEGES
  16 +TABLE_STATISTICS
  17  TRIGGERS
  18  USER_PRIVILEGES
  19 +USER_STATISTICS
  20  VIEWS
  21  columns_priv
  22  db
  23 @@ -82,6 +85,7 @@
  24  TABLES TABLES
  25  TABLE_CONSTRAINTS      TABLE_CONSTRAINTS
  26  TABLE_PRIVILEGES       TABLE_PRIVILEGES
  27 +TABLE_STATISTICS       TABLE_STATISTICS
  28  TRIGGERS       TRIGGERS
  29  tables_priv    tables_priv
  30  time_zone      time_zone
  31 @@ -101,6 +105,7 @@
  32  TABLES TABLES
  33  TABLE_CONSTRAINTS      TABLE_CONSTRAINTS
  34  TABLE_PRIVILEGES       TABLE_PRIVILEGES
  35 +TABLE_STATISTICS       TABLE_STATISTICS
  36  TRIGGERS       TRIGGERS
  37  tables_priv    tables_priv
  38  time_zone      time_zone
  39 @@ -120,6 +125,7 @@
  40  TABLES TABLES
  41  TABLE_CONSTRAINTS      TABLE_CONSTRAINTS
  42  TABLE_PRIVILEGES       TABLE_PRIVILEGES
  43 +TABLE_STATISTICS       TABLE_STATISTICS
  44  TRIGGERS       TRIGGERS
  45  tables_priv    tables_priv
  46  time_zone      time_zone
  47 @@ -599,6 +605,7 @@
  48  TABLES
  49  TABLE_CONSTRAINTS
  50  TABLE_PRIVILEGES
  51 +TABLE_STATISTICS
  52  TRIGGERS
  53  create database information_schema;
  54  ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
  55 @@ -608,6 +615,7 @@
  56  TABLES SYSTEM VIEW
  57  TABLE_CONSTRAINTS      SYSTEM VIEW
  58  TABLE_PRIVILEGES       SYSTEM VIEW
  59 +TABLE_STATISTICS       SYSTEM VIEW
  60  TRIGGERS       SYSTEM VIEW
  61  create table t1(a int);
  62  ERROR 42S02: Unknown table 't1' in information_schema
  63 @@ -620,6 +628,7 @@
  64  TABLES
  65  TABLE_CONSTRAINTS
  66  TABLE_PRIVILEGES
  67 +TABLE_STATISTICS
  68  TRIGGERS
  69  select table_name from tables where table_name='user';
  70  table_name
  71 @@ -729,7 +738,7 @@
  72  CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
  73  CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
  74  count(*)
  75 -101
  76 +104
  77  drop view a2, a1;
  78  drop table t_crashme;
  79  select table_schema,table_name, column_name from
  80 @@ -794,13 +803,14 @@
  81  TABLES TABLE_NAME      select
  82  TABLE_CONSTRAINTS      TABLE_NAME      select
  83  TABLE_PRIVILEGES       TABLE_NAME      select
  84 +TABLE_STATISTICS       TABLE_NAME      select
  85  VIEWS  TABLE_NAME      select
  86  delete from mysql.user where user='mysqltest_4';
  87  delete from mysql.db where user='mysqltest_4';
  88  flush privileges;
  89  SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;
  90  table_schema   count(*)
  91 -information_schema     16
  92 +information_schema     19
  93  mysql  17
  94  create table t1 (i int, j int);
  95  create trigger trg1 before insert on t1 for each row
  96 @@ -1190,6 +1200,7 @@
  97  COLLATION_CHARACTER_SET_APPLICABILITY  COLLATION_NAME
  98  COLUMNS        TABLE_SCHEMA
  99  COLUMN_PRIVILEGES      TABLE_SCHEMA
 100 +INDEX_STATISTICS       INDEX_NAME
 101  KEY_COLUMN_USAGE       CONSTRAINT_SCHEMA
 102  ROUTINES       ROUTINE_SCHEMA
 103  SCHEMATA       SCHEMA_NAME
 104 @@ -1198,8 +1209,10 @@
 105  TABLES TABLE_SCHEMA
 106  TABLE_CONSTRAINTS      CONSTRAINT_SCHEMA
 107  TABLE_PRIVILEGES       TABLE_SCHEMA
 108 +TABLE_STATISTICS       TABLE_NAME
 109  TRIGGERS       TRIGGER_SCHEMA
 110  USER_PRIVILEGES        GRANTEE
 111 +USER_STATISTICS        USER
 112  VIEWS  TABLE_SCHEMA
 113  SELECT t.table_name, c1.column_name
 114  FROM information_schema.tables t
 115 @@ -1221,6 +1234,7 @@
 116  COLLATION_CHARACTER_SET_APPLICABILITY  COLLATION_NAME
 117  COLUMNS        TABLE_SCHEMA
 118  COLUMN_PRIVILEGES      TABLE_SCHEMA
 119 +INDEX_STATISTICS       INDEX_NAME
 120  KEY_COLUMN_USAGE       CONSTRAINT_SCHEMA
 121  ROUTINES       ROUTINE_SCHEMA
 122  SCHEMATA       SCHEMA_NAME
 123 @@ -1229,8 +1243,10 @@
 124  TABLES TABLE_SCHEMA
 125  TABLE_CONSTRAINTS      CONSTRAINT_SCHEMA
 126  TABLE_PRIVILEGES       TABLE_SCHEMA
 127 +TABLE_STATISTICS       TABLE_NAME
 128  TRIGGERS       TRIGGER_SCHEMA
 129  USER_PRIVILEGES        GRANTEE
 130 +USER_STATISTICS        USER
 131  VIEWS  TABLE_SCHEMA
 132  SELECT MAX(table_name) FROM information_schema.tables;
 133  MAX(table_name)
 134 @@ -1303,6 +1319,7 @@
 135  COLLATION_CHARACTER_SET_APPLICABILITY  information_schema.COLLATION_CHARACTER_SET_APPLICABILITY        1
 136  COLUMNS        information_schema.COLUMNS      1
 137  COLUMN_PRIVILEGES      information_schema.COLUMN_PRIVILEGES    1
 138 +INDEX_STATISTICS       information_schema.INDEX_STATISTICS     1
 139  KEY_COLUMN_USAGE       information_schema.KEY_COLUMN_USAGE     1
 140  ROUTINES       information_schema.ROUTINES     1
 141  SCHEMATA       information_schema.SCHEMATA     1
 142 @@ -1311,8 +1328,10 @@
 143  TABLES information_schema.TABLES       1
 144  TABLE_CONSTRAINTS      information_schema.TABLE_CONSTRAINTS    1
 145  TABLE_PRIVILEGES       information_schema.TABLE_PRIVILEGES     1
 146 +TABLE_STATISTICS       information_schema.TABLE_STATISTICS     1
 147  TRIGGERS       information_schema.TRIGGERS     1
 148  USER_PRIVILEGES        information_schema.USER_PRIVILEGES      1
 149 +USER_STATISTICS        information_schema.USER_STATISTICS      1
 150  VIEWS  information_schema.VIEWS        1
 151  create table t1(f1 int);
 152  create view v1 as select f1+1 as a from t1;
 153 diff -r 0029211e0356 mysql-test/r/information_schema_db.result
 154 --- a/mysql-test/r/information_schema_db.result Mon Sep 08 16:38:54 2008 -0700
 155 +++ b/mysql-test/r/information_schema_db.result Mon Sep 08 16:39:00 2008 -0700
 156 @@ -10,6 +10,7 @@
 157  COLLATION_CHARACTER_SET_APPLICABILITY
 158  COLUMNS
 159  COLUMN_PRIVILEGES
 160 +INDEX_STATISTICS
 161  KEY_COLUMN_USAGE
 162  ROUTINES
 163  SCHEMATA
 164 @@ -18,14 +19,17 @@
 165  TABLES
 166  TABLE_CONSTRAINTS
 167  TABLE_PRIVILEGES
 168 +TABLE_STATISTICS
 169  TRIGGERS
 170  USER_PRIVILEGES
 171 +USER_STATISTICS
 172  VIEWS
 173  show tables from INFORMATION_SCHEMA like 'T%';
 174  Tables_in_information_schema (T%)
 175  TABLES
 176  TABLE_CONSTRAINTS
 177  TABLE_PRIVILEGES
 178 +TABLE_STATISTICS
 179  TRIGGERS
 180  create database `inf%`;
 181  create database mbase;
 182 diff -r 0029211e0356 mysql-test/r/mysqlshow.result
 183 --- a/mysql-test/r/mysqlshow.result     Mon Sep 08 16:38:54 2008 -0700
 184 +++ b/mysql-test/r/mysqlshow.result     Mon Sep 08 16:39:00 2008 -0700
 185 @@ -84,6 +84,7 @@
 186  | COLLATION_CHARACTER_SET_APPLICABILITY |
 187  | COLUMNS                               |
 188  | COLUMN_PRIVILEGES                     |
 189 +| INDEX_STATISTICS                      |
 190  | KEY_COLUMN_USAGE                      |
 191  | ROUTINES                              |
 192  | SCHEMATA                              |
 193 @@ -92,8 +93,10 @@
 194  | TABLES                                |
 195  | TABLE_CONSTRAINTS                     |
 196  | TABLE_PRIVILEGES                      |
 197 +| TABLE_STATISTICS                      |
 198  | TRIGGERS                              |
 199  | USER_PRIVILEGES                       |
 200 +| USER_STATISTICS                       |
 201  | VIEWS                                 |
 202  +---------------------------------------+
 203  Database: INFORMATION_SCHEMA
 204 @@ -105,6 +108,7 @@
 205  | COLLATION_CHARACTER_SET_APPLICABILITY |
 206  | COLUMNS                               |
 207  | COLUMN_PRIVILEGES                     |
 208 +| INDEX_STATISTICS                      |
 209  | KEY_COLUMN_USAGE                      |
 210  | ROUTINES                              |
 211  | SCHEMATA                              |
 212 @@ -113,8 +117,10 @@
 213  | TABLES                                |
 214  | TABLE_CONSTRAINTS                     |
 215  | TABLE_PRIVILEGES                      |
 216 +| TABLE_STATISTICS                      |
 217  | TRIGGERS                              |
 218  | USER_PRIVILEGES                       |
 219 +| USER_STATISTICS                       |
 220  | VIEWS                                 |
 221  +---------------------------------------+
 222  Wildcard: inf_rmation_schema