diff options
| author | unknown <serg@serg.mylan> | 2003-06-16 23:05:45 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-06-16 23:05:45 +0200 |
| commit | ad5c763e74821465cc8237aa39e2391239a17206 (patch) | |
| tree | 225a6aa19779a08d242bb2e5a07f1c8a263f6660 /sql | |
| parent | e85ecbc101879476c8f76f4be62019c0f70437b1 (diff) | |
| download | mariadb-git-ad5c763e74821465cc8237aa39e2391239a17206.tar.gz | |
fulltext and left join bug fixed
mysql-test/t/fulltext.test:
explain select fulltext test
mysql-test/t/fulltext_left_join.test:
explain select fulltext test
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 3 | ||||
| -rw-r--r-- | sql/sql_select.cc | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 532a7cedec0..e847b203006 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2299,6 +2299,9 @@ double Item_func_match::val() if (ft_handler == NULL) DBUG_RETURN(-1.0); + if (table->null_row) /* NULL row from an outer join */ + return 0.0; + if (join_key) { if (table->file->ft_handler) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index ff6fde1ca0c..0e8b191e4ef 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1688,6 +1688,9 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array, if (!cond_func || cond_func->key == NO_SUCH_KEY) return; + if (!(usable_tables & cond_func->table->map)) + return; + KEYUSE keyuse; keyuse.table= cond_func->table; |