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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
This commit is contained in:
cmiller@zippy.cornsilk.net 2006-09-05 17:28:12 -04:00
commit 02b40b04e6

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;