bzr push into mysql-5.1 branch (tomas.ulin:2710 to 2711) Bug#40346

[Tomas Ulin]

 2711 Tomas Ulin	2008-10-29
      Bug#40346 - correction for embedded
modified:
  sql/ha_ndbcluster_binlog.h

 2710 Tomas Ulin	2008-10-29
      Bug#40246 - alter when table is locked does not work
added:
  mysql-test/suite/ndb/r/ndb_dbug_lock.result
  mysql-test/suite/ndb/t/ndb_dbug_lock.test
modified:
  sql/ha_ndbcluster.cc
  sql/ha_ndbcluster_binlog.cc
  sql/ha_ndbcluster_binlog.h
  sql/handler.cc
  sql/handler.h
  sql/sql_table.cc

=== modified file 'sql/ha_ndbcluster_binlog.h'
--- a/sql/ha_ndbcluster_binlog.h	2008-10-29 13:09:15 +0000
+++ b/sql/ha_ndbcluster_binlog.h	2008-10-29 14:07:35 +0000
@@ -147,8 +147,13 @@ private:
 };
 
 extern Ndb_cluster_connection* g_ndb_cluster_connection;
+#ifdef HAVE_NDB_BINLOG
 void ndbcluster_global_schema_lock_init();
 void ndbcluster_global_schema_lock_deinit();
+#else
+inline void ndbcluster_global_schema_lock_init() {}
+inline void ndbcluster_global_schema_lock_deinit() {}
+#endif
 
 #ifdef HAVE_NDB_BINLOG
 extern pthread_t ndb_binlog_thread;