diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-11-23 18:57:26 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-11-23 19:41:44 +0300 |
| commit | 6e0b2c7fe027a897688c729b55a08e748817cef0 (patch) | |
| tree | 98ca98e5c0b307c4a0dfe7a55623fe46d4ab35c7 /sql/sql_base.cc | |
| parent | cbe93291e4391dc5788c022e92d1baf17ca33625 (diff) | |
| parent | 1773116fe03e893a74af2d35038470d3033054f2 (diff) | |
| download | mariadb-git-6e0b2c7fe027a897688c729b55a08e748817cef0.tar.gz | |
System Versioning 1.0pre2
Merge branch '10.3' into trunk
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 99971a53a3c..b83e597a36d 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -8555,7 +8555,8 @@ int init_ftfuncs(THD *thd, SELECT_LEX *select_lex, bool no_order) Item_func_match *ifm; while ((ifm=li++)) - ifm->init_search(thd, no_order); + if (ifm->init_search(thd, no_order)) + return 1; } return 0; } |