bk commit into 5.1 tree (mskold:1.2348) BUG#17840

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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.2348 06/04/24 15:50:05 mskold@stripped +1 -0
  Fix for Bug #17840  mysqldump should not dump tables in database cluster, reuse existing
define

  client/mysqldump.c
    1.234 06/04/24 15:49:53 mskold@stripped +2 -2
    Fix for Bug #17840  mysqldump should not dump tables in database cluster, reuse
existing define

# 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:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-5.1-new

--- 1.233/client/mysqldump.c	2006-04-24 15:38:45 +02:00
+++ 1.234/client/mysqldump.c	2006-04-24 15:49:53 +02:00
@@ -50,6 +50,7 @@
 #include "mysql.h"
 #include "mysql_version.h"
 #include "mysqld_error.h"
+#include "sql/ha_ndbcluster_tables.h"
 
 /* Exit codes */
 
@@ -134,7 +135,6 @@
 const char *default_dbug_option="d:t:o,/tmp/mysqldump.trace";
 /* do we met VIEWs during tables scaning */
 my_bool was_views= 0;
-const char * cluster_db="cluster";
 const char *compatible_mode_names[]=
 {
   "MYSQL323", "MYSQL40", "POSTGRESQL", "ORACLE", "MSSQL", "DB2",
@@ -2937,7 +2937,7 @@
   afterdot= strmov(hash_key, database);
   *afterdot++= '.';
 
-  if (!strcmp(database, cluster_db)) /* Skip cluster internal database */
+  if (!strcmp(database, NDB_REP_DB)) /* Skip cluster internal database */
     return 0;
   if (init_dumping(database))
     return 1;