bzr commit into mysql-5.1 branch (tomas.ulin:2697)

[Tomas Ulin]

#At file:///home/tomas/mysql_src/mysql-5.1-telco-6.3/

 2697 Tomas Ulin	2008-10-02 [merge]
      merge
modified:
  sql/ha_ndbcluster.cc

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2008-10-02 08:19:14 +0000
+++ b/sql/ha_ndbcluster.cc	2008-10-02 09:27:40 +0000
@@ -5307,9 +5307,11 @@ int ha_ndbcluster::start_statement(THD *
     /* This is currently dead code in wait for implementation in NDB */
     /* lockThisTable(); */
     DBUG_PRINT("info", ("Locking the table..." ));
+#ifdef NOT_YET
     push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
                         ER_GET_ERRMSG, ER(ER_GET_ERRMSG), 0,
                         "Table only locked locally in this mysqld", "NDB");
+#endif
   }
   DBUG_RETURN(0);
 }