diff options
| author | unknown <istruewing@stella.local> | 2007-08-31 11:55:56 +0200 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-08-31 11:55:56 +0200 |
| commit | fdb19238fe51ca6d8760dbaf2dbc8f825a2a8ffa (patch) | |
| tree | 3f82f2dd1ecdc3a9aa1c65a70ba9daa40ee3d8ad /sql/table.cc | |
| parent | 674f49f8f415c35b37660d85234e268bd3bd03ef (diff) | |
| parent | 24e7b25695f8d6a403dca389034aff81348ef399 (diff) | |
| download | mariadb-git-fdb19238fe51ca6d8760dbaf2dbc8f825a2a8ffa.tar.gz | |
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
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index c1d8e3abe94..ccddbf8134b 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -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) |