bk commit into 5.1 tree (tomas:1.2546) BUG#20872

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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, 2007-08-30 10:41:19+02:00, tomas@stripped +2 -0
  Bug#20872 master*.err: miscellaneous error messages

  sql/ha_ndbcluster.cc@stripped, 2007-08-30 10:41:16+02:00, tomas@stripped +3
-0
    remove warning for table exists in mysqld error log

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-08-30 10:41:16+02:00,
tomas@stripped +11 -4
    remove warning for table exists in mysqld error log

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2007-08-28 15:47:09 +02:00
+++ b/sql/ha_ndbcluster.cc	2007-08-30 10:41:16 +02:00
@@ -331,6 +331,7 @@ Thd_ndb::Thd_ndb()
   all= NULL;
   stmt= NULL;
   m_error= FALSE;
+  m_error_code= 0;
   query_state&= NDB_QUERY_NORMAL;
   options= 0;
   (void) hash_init(&open_tables, &my_charset_bin, 5, 0, 0,
@@ -366,6 +367,7 @@ Thd_ndb::init_open_tables()
 {
   count= 0;
   m_error= FALSE;
+  m_error_code= 0;
   my_hash_reset(&open_tables);
 }
 
@@ -489,6 +491,7 @@ void ha_ndbcluster::no_uncommitted_rows_
     return;
   DBUG_ENTER("ha_ndbcluster::no_uncommitted_rows_execute_failure");
   get_thd_ndb(current_thd)->m_error= TRUE;
+  get_thd_ndb(current_thd)->m_error_code= 0;
   DBUG_VOID_RETURN;
 }
 
diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2007-08-23 16:18:05 +02:00
+++ b/sql/ha_ndbcluster_binlog.cc	2007-08-30 10:41:16 +02:00
@@ -264,12 +264,13 @@ static void run_query(THD *thd, char *bu
     int i;
     Thd_ndb *thd_ndb= get_thd_ndb(thd);
     for (i= 0; no_print_error[i]; i++)
-      if (thd_ndb->m_error == no_print_error[i])
+      if ((thd_ndb->m_error_code == no_print_error[i]) ||
+          (thd->net.last_errno == no_print_error[i]))
         break;
     if (!no_print_error[i])
       sql_print_error("NDB: %s: error %s %d(ndb: %d) %d %d",
                       buf, thd->net.last_error, thd->net.last_errno,
-                      thd_ndb->m_error,
+                      thd_ndb->m_error_code,
                       thd->net.report_error, thd->query_error);
   }
 
@@ -779,7 +780,10 @@ static int ndbcluster_create_ndb_apply_s
                    " end_pos BIGINT UNSIGNED NOT NULL, "
                    " PRIMARY KEY USING HASH (server_id) ) ENGINE=NDB");
 
-  const int no_print_error[3]= {701, 4009, 0}; // do not print error 701 etc
+  const int no_print_error[4]= {ER_TABLE_EXISTS_ERROR,
+                                701,
+                                4009,
+                                0}; // do not print error 701 etc
   run_query(thd, buf, end, no_print_error, TRUE);
 
   DBUG_RETURN(0);
@@ -836,7 +840,10 @@ static int ndbcluster_create_schema_tabl
                    " type INT UNSIGNED NOT NULL,"
                    " PRIMARY KEY USING HASH (db,name) ) ENGINE=NDB");
 
-  const int no_print_error[3]= {701, 4009, 0}; // do not print error 701 etc
+  const int no_print_error[4]= {ER_TABLE_EXISTS_ERROR,
+                                701,
+                                4009,
+                                0}; // do not print error 701 etc
   run_query(thd, buf, end, no_print_error, TRUE);
 
   DBUG_RETURN(0);