1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

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
This commit is contained in:
unknown
2006-09-05 17:28:12 -04:00

View File

@@ -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;