bk commit into 5.1 tree (stewart:1.2119)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2119 06/02/02 00:47:08 stewart@stripped +5 -0
  some fixes from review of WL1359.
  fix up test cases.

  sql/table.h
    1.127 06/02/02 00:47:04 stewart@stripped +1 -0
    add SCH_FILES to information schema enum

  sql/sql_show.cc
    1.296 06/02/02 00:47:04 stewart@stripped +1 -1
    correct DBUG_ENTER for fill_schema_files

  sql/ha_ndbcluster.cc
    1.253 06/02/02 00:47:03 stewart@stripped +2 -2
    in fill_files_table, use my_snprintf instead of snprintf

  mysql-test/r/information_schema_db.result
    1.11 06/02/02 00:47:03 stewart@stripped +1 -0
    update result for INFORMATION_SCHEMA.FILES

  mysql-test/r/information_schema.result
    1.105 06/02/02 00:47:03 stewart@stripped +10 -2
    update result for INFORMATION_SCHEMA.FILES

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/wl1359

--- 1.295/sql/sql_show.cc	2006-02-01 18:23:30 +11:00
+++ 1.296/sql/sql_show.cc	2006-02-02 00:47:04 +11:00
@@ -4586,7 +4586,7 @@
 {
   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;

--- 1.126/sql/table.h	2006-01-30 23:15:05 +11:00
+++ 1.127/sql/table.h	2006-02-02 00:47:04 +11:00
@@ -339,6 +339,7 @@
   SCH_COLUMN_PRIVILEGES,
   SCH_ENGINES,
   SCH_EVENTS,
+  SCH_FILES,
   SCH_KEY_COLUMN_USAGE,
   SCH_OPEN_TABLES,
   SCH_PARTITIONS,

--- 1.104/mysql-test/r/information_schema.result	2006-01-30 23:15:03 +11:00
+++ 1.105/mysql-test/r/information_schema.result	2006-02-02 00:47:03 +11:00
@@ -45,6 +45,7 @@
 COLUMN_PRIVILEGES
 ENGINES
 EVENTS
+FILES
 KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
@@ -735,7 +736,7 @@
 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	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 @@
 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 @@
 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

--- 1.10/mysql-test/r/information_schema_db.result	2006-01-30 23:15:03 +11:00
+++ 1.11/mysql-test/r/information_schema_db.result	2006-02-02 00:47:03 +11:00
@@ -8,6 +8,7 @@
 COLUMN_PRIVILEGES
 ENGINES
 EVENTS
+FILES
 KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS

--- 1.252/sql/ha_ndbcluster.cc	2006-02-01 18:22:45 +11:00
+++ 1.253/sql/ha_ndbcluster.cc	2006-02-02 00:47:03 +11:00
@@ -9666,7 +9666,7 @@
       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 @@
       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);
     }