Commit 24e7b256 authored by unknown's avatar unknown

Merge april.(none):/home/svoj/devel/bk/mysql-5.1-engines

into  april.(none):/home/svoj/devel/mysql/mysql-5.1-engines


sql/table.cc:
  Auto merged
parents 7e9e0efd 6b205f93
...@@ -966,6 +966,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, ...@@ -966,6 +966,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
} }
parser_name.str= (char*) next_chunk; parser_name.str= (char*) next_chunk;
parser_name.length= strlen((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, keyinfo->parser= my_plugin_lock_by_name(NULL, &parser_name,
MYSQL_FTPARSER_PLUGIN); MYSQL_FTPARSER_PLUGIN);
if (! keyinfo->parser) if (! keyinfo->parser)
......
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