diff options
| -rw-r--r-- | mysql-test/r/information_schema.result | 12 | ||||
| -rw-r--r-- | mysql-test/r/information_schema_db.result | 1 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 | ||||
| -rw-r--r-- | sql/table.h | 1 |
5 files changed, 15 insertions, 5 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 40706fd9c55..8ed0faf3824 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -45,6 +45,7 @@ COLUMNS COLUMN_PRIVILEGES ENGINES EVENTS +FILES KEY_COLUMN_USAGE PARTITIONS PLUGINS @@ -735,7 +736,7 @@ CREATE TABLE t_crashme ( f1 BIGINT); CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1; CREATE VIEW a2 AS SELECT t_CRASHME FROM a1; count(*) -110 +111 drop view a2, a1; drop table t_crashme; select table_schema,table_name, column_name from @@ -765,6 +766,12 @@ EVENTS ENDS datetime EVENTS CREATED datetime EVENTS LAST_ALTERED datetime EVENTS LAST_EXECUTED datetime +FILES CREATION_TIME datetime +FILES LAST_UPDATE_TIME datetime +FILES LAST_ACCESS_TIME datetime +FILES CREATE_TIME datetime +FILES UPDATE_TIME datetime +FILES CHECK_TIME datetime PARTITIONS CREATE_TIME datetime PARTITIONS UPDATE_TIME datetime PARTITIONS CHECK_TIME datetime @@ -813,6 +820,7 @@ where COLUMN_NAME='TABLE_NAME'; TABLE_NAME COLUMN_NAME PRIVILEGES COLUMNS TABLE_NAME select COLUMN_PRIVILEGES TABLE_NAME select +FILES TABLE_NAME select KEY_COLUMN_USAGE TABLE_NAME select PARTITIONS TABLE_NAME select STATISTICS TABLE_NAME select @@ -826,7 +834,7 @@ flush privileges; SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA; table_schema count(*) cluster_replication 1 -information_schema 20 +information_schema 21 mysql 21 create table t1 (i int, j int); create trigger trg1 before insert on t1 for each row diff --git a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result index 1ad996dedd5..7b106cb0e55 100644 --- a/mysql-test/r/information_schema_db.result +++ b/mysql-test/r/information_schema_db.result @@ -8,6 +8,7 @@ COLUMNS COLUMN_PRIVILEGES ENGINES EVENTS +FILES KEY_COLUMN_USAGE PARTITIONS PLUGINS diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 349d8604635..0d13121c8b3 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -9666,7 +9666,7 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond) table->field[c++]->store("NORMAL",6, system_charset_info); char extra[30]; - int len= snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u",id); + int len= my_snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u",id); table->field[c]->store(extra,len,system_charset_info); schema_table_store_record(thd, table); } @@ -9741,7 +9741,7 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, COND *cond) table->field[c++]->store("NORMAL",6, system_charset_info); char extra[30]; - int len= snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u",id); + int len= my_snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u",id); table->field[c]->store(extra,len,system_charset_info); schema_table_store_record(thd, table); } diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 4218a55634c..e616439033a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4586,7 +4586,7 @@ int fill_schema_files(THD *thd, TABLE_LIST *tables, COND *cond) { int i; TABLE *table= tables->table; - DBUG_ENTER("fill_schema_logfile_groups"); + DBUG_ENTER("fill_schema_files"); struct run_hton_fill_schema_files_args args; args.tables= tables; diff --git a/sql/table.h b/sql/table.h index 213310a51dc..bcc2f89655b 100644 --- a/sql/table.h +++ b/sql/table.h @@ -339,6 +339,7 @@ enum enum_schema_tables SCH_COLUMN_PRIVILEGES, SCH_ENGINES, SCH_EVENTS, + SCH_FILES, SCH_KEY_COLUMN_USAGE, SCH_OPEN_TABLES, SCH_PARTITIONS, |