Commit d2590a8f authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

parents 42fc1a9e 799129e2
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -117,8 +117,7 @@ static int simple_parser_init(MYSQL_FTPARSER_PARAM *param)
    1                    failure (cannot happen)
*/

static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param
                                __attribute__((unused)))
static int simple_parser_deinit(MYSQL_FTPARSER_PARAM *param)
{
  return(0);
}