Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb

into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb

Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
d14cba10 · stewart@willster.(none) · 8ea0a239 · 3dbcaa6f · d14cba10
Commit d14cba10 authored Aug 30, 2007 by stewart@willster.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/ndb/src/mgmapi/mgmapi.cpp storage/ndb/src/mgmapi/mgmapi.cpp +1 -1

No files found.
--- a/storage/ndb/src/mgmapi/mgmapi.cpp
+++ b/storage/ndb/src/mgmapi/mgmapi.cpp
@@ -408,7 +408,7 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
    }
    else
    {
-      CHECK_TIMEDOUT_RET(handle, in, out, NULL);
+      DBUG_CHECK_TIMEDOUT_RET(handle, in, out, NULL);
      if(ctx.m_status==Parser_t::Eof
 	 || ctx.m_status==Parser_t::NoLine)
      {