Merge stella.local:/home/mydev/mysql-5.1-amain

into  stella.local:/home/mydev/mysql-5.1-axmrg


mysql-test/include/have_bug25714.inc:
  Auto merged
sql/table.cc:
  Auto merged
This commit is contained in:
unknown 2007-08-31 11:55:56 +02:00
commit fdb19238fe

View file

@ -969,6 +969,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
}
parser_name.str= (char*) next_chunk;
parser_name.length= strlen((char*) next_chunk);
next_chunk+= parser_name.length + 1;
keyinfo->parser= my_plugin_lock_by_name(NULL, &parser_name,
MYSQL_FTPARSER_PLUGIN);
if (! keyinfo->parser)