From 14d8fdb295a208233e68d80187b7b45cf9b09915 Mon Sep 17 00:00:00 2001
From: "mskold@mysql.com" <>
Date: Mon, 24 Apr 2006 15:39:49 +0200
Subject: [PATCH 1/2] Fix for Bug #17840  mysqldump should not dump tables in
 database cluster, skip cluster internal database

---
 client/mysqldump.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/mysqldump.c b/client/mysqldump.c
index f268ca5b468..a0da4a1d13b 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -134,7 +134,7 @@ static CHARSET_INFO *charset_info= &my_charset_latin1;
 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,6 +2937,8 @@ static int dump_all_tables_in_db(char *database)
   afterdot= strmov(hash_key, database);
   *afterdot++= '.';
 
+  if (!strcmp(database, cluster_db)) /* Skip cluster internal database */
+    return 0;
   if (init_dumping(database))
     return 1;
   if (opt_xml)

From e95e6ddcb4b0e1bef376dd66bf596721df17003f Mon Sep 17 00:00:00 2001
From: "mskold@mysql.com" <>
Date: Mon, 24 Apr 2006 15:50:05 +0200
Subject: [PATCH 2/2] Fix for Bug #17840  mysqldump should not dump tables in
 database cluster, reuse existing define

---
 client/mysqldump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/mysqldump.c b/client/mysqldump.c
index a0da4a1d13b..23d78a588a7 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -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 @@ static CHARSET_INFO *charset_info= &my_charset_latin1;
 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 @@ static int dump_all_tables_in_db(char *database)
   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;