Commit dabc073c authored by unknown's avatar unknown

Merge mysql.com:/data0/mysqldev/lenz/mysql-4.1

into mysql.com:/data0/mysqldev/lenz/mysql-5.0


ndb/src/common/portlib/NdbMutex.c:
  Auto merged
ndb/src/common/portlib/NdbThread.c:
  Auto merged
parents acc42386 820a9c5f
...@@ -359,7 +359,7 @@ Match::eval(NdbMgmHandle h, const Iter& iter) ...@@ -359,7 +359,7 @@ Match::eval(NdbMgmHandle h, const Iter& iter)
} }
else if(iter.get(m_key, &val64) == 0) else if(iter.get(m_key, &val64) == 0)
{ {
if(atoll(m_value.c_str()) != val64) if(strtoll(m_value.c_str(), (char **)NULL, 10) != val64)
return 0; return 0;
} }
else if(iter.get(m_key, &valc) == 0) else if(iter.get(m_key, &valc) == 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment