bk commit into 5.1 tree (dli:1.2317) BUG#18647

[David Li]

Below is the list of changes that have just been committed into a local
5.1 repository of dli. When dli 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@stripped, 2006-11-01 11:04:26+08:00, dli@stripped +1 -0
  ndb - BUG#18647, cluster.schema database needs to be hidden.
  
  Hide cluster.schema table when executing 'show tables' on mysql client.

  sql/ha_ndbcluster.cc@stripped, 2006-11-01 11:04:23+08:00, dli@stripped +17 -0
    Hide cluster.schema table to user.

# 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:	dli
# Host:	dev3-76.dev.cn.tlan
# Root:	/home/dli/mysql/mysql-5.1/mysql-5.1-bug-18647

--- 1.358/sql/ha_ndbcluster.cc	2006-11-01 11:04:34 +08:00
+++ 1.359/sql/ha_ndbcluster.cc	2006-11-01 11:04:34 +08:00
@@ -6404,6 +6404,23 @@
   
   hash_free(&ok_tables);
   hash_free(&ndb_tables);
+
+  // Delete schema file from files
+  if (!strcmp(db, NDB_REP_DB))
+  {
+    uint count = 0;
+    while (count++ < files->elements)
+    {
+      file_name = (char *)files->pop();
+      if (!strcmp(file_name, NDB_SCHEMA_TABLE))
+      {
+        DBUG_PRINT("info", ("skip %s.%s table, it should be hidden to user",
+                   NDB_REP_DB, NDB_SCHEMA_TABLE));
+        continue;
+      }
+      files->push_back(file_name); 
+    }
+  }
   } // extra bracket to avoid gcc 2.95.3 warning
   DBUG_RETURN(0);    
 }