Commit 3c59758f authored by joreland@mysql.com's avatar joreland@mysql.com

Merge mysql.com:/home/jonas/src/mysql-4.1

into  mysql.com:/home/jonas/src/mysql-5.0
parents c12b4160 0cd9e2e2
...@@ -317,8 +317,8 @@ parse_where(Vector<Match*>& where, int &argc, char**& argv) ...@@ -317,8 +317,8 @@ parse_where(Vector<Match*>& where, int &argc, char**& argv)
return 0; return 0;
} }
template Vector<Apply*>; template class Vector<Apply*>;
template Vector<Match*>; template class Vector<Match*>;
static static
int int
......
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