diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-06 15:14:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-06 15:14:46 +0200 |
| commit | 6770a9a836fcc8aa9f49f6b91ce237851638916b (patch) | |
| tree | 7bb7d4fd838813b1fd7054c6c32a79b5541561cf /sql/sql_base.cc | |
| parent | 385de8743added00cfaece08720e3a9a789760a5 (diff) | |
| download | mariadb-git-6770a9a836fcc8aa9f49f6b91ce237851638916b.tar.gz | |
MDEV-4316 MariaDB server crash with signal 11
fulltext search was initialized for all MATCH ... AGAINST items
at the end of the JOIN::optimize(). But since 5.3 derived tables
are initialized lazily on first use, very late in the sub_select().
Skip Item_func_match::init_search initialization if the corresponding
table isn't open yet; repeat fulltext initialization for all
not-yet-initialized MATCH ... AGAINST items after creating derived tables.
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 50e00dfa041..22dc09351c7 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -9241,7 +9241,6 @@ int init_ftfuncs(THD *thd, SELECT_LEX *select_lex, bool no_order) List_iterator<Item_func_match> li(*(select_lex->ftfunc_list)); Item_func_match *ifm; DBUG_PRINT("info",("Performing FULLTEXT search")); - thd_proc_info(thd, "FULLTEXT initialization"); while ((ifm=li++)) ifm->init_search(no_order); |