Commit 52f5b9dd authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


storage/ndb/tools/ndb_condig.cpp:
  Auto merged
parents 721e9417 20dbceb6

storage/ndb/tools/ndb_condig.cpp

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ struct Match 


struct HostMatch : public Match

{

  virtual int eval(NdbMgmHandle, const Iter&);

  virtual int eval(const Iter&);

};



struct Apply
@@ -402,7 +402,7 @@ Match::eval(const Iter& iter) 
}



int

HostMatch::eval(NdbMgmHandle h, const Iter& iter)

HostMatch::eval(const Iter& iter)

{

  const char* valc;