summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorserg@sergbook.mysql.com <>2002-05-25 20:59:50 +0200
committerserg@sergbook.mysql.com <>2002-05-25 20:59:50 +0200
commit66b41d19c2620ce5eba82b728b32b503faf97e01 (patch)
tree6624e920db6bb88012db2e867d815d74a9812796
parentfa5717b95028087ed22ff2a69b2ce1c80f852aba (diff)
downloadmariadb-git-66b41d19c2620ce5eba82b728b32b503faf97e01.tar.gz
quick fix for some optimizer glitch (it appears as ft+const bug, but it, probably, isn't)
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--sql/sql_select.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index bd35c33892e..04eef3cd442 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -16,3 +16,4 @@ jani@hynda.mysql.fi
miguel@hegel.local
arjen@fred.bitbike.com
sinisa@rhols221.adsl.netsonic.fi
+serg@sergbook.mysql.com
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index c4383cbb09f..c92463d65bd 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2128,7 +2128,7 @@ get_best_combination(JOIN *join)
have a 'normal' value or a NULL value.
*/
j->type=JT_CONST;
- if (join->const_tables == tablenr)
+ if (join->const_tables == tablenr && !form->fulltext_searched)
{
join->const_tables++;
join->const_table_map|=form->map;