diff options
| author | sasha@mysql.sashanet.com <> | 2000-10-08 01:48:50 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2000-10-08 01:48:50 -0600 |
| commit | 1fbc40219c6846fc21484d2a75c2c06b2367545e (patch) | |
| tree | 569e42d920c18f5d5edf91a783fcf98522e11045 /sql/sql_select.cc | |
| parent | 1e562819cde901c798cfeeb7b074588ca84f150f (diff) | |
| download | mariadb-git-1fbc40219c6846fc21484d2a75c2c06b2367545e.tar.gz | |
Docs/manual.texi
replication updates
sql/opt_range.h
fixed compiler warning
sql/slave.cc
fixed handling of long usernames
fixed insert_id + query log event processing atomicity in the case
of slave death
fix edcharset coversion to not be global to all threads
sql/sql_class.h
fix to make insert_id event and the subsequent query event be still processed
atomically if slave dies in the middle
sql/sql_select.cc
temp fix to make it compile
repl-tests/test-auto-inc/run.test@1.1
New BitKeeper file ``repl-tests/test-auto-inc/run.test''
repl-tests/test-auto-inc/x.master@1.1
New BitKeeper file ``repl-tests/test-auto-inc/x.master''
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b3ed65589bb..812ac9ee8d5 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -23,7 +23,11 @@ #include "mysql_priv.h" #include "sql_select.h" -#include "opt_ft.h" + +#if 0 // Sergei - remove when fixed +#include "opt_ft.h" +#endif + #include <m_ctype.h> #include <hash.h> #include <ft_global.h> @@ -5045,6 +5049,11 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit) DBUG_RETURN(0); // Can't use index. } +// Sergei - remove this one when you have added opt_ft stuff +QUICK_SELECT *get_ft_or_quick_select_for_ref(TABLE *table, JOIN_TAB *tab) +{ + return get_quick_select_for_ref(table, &tab->ref); +} static int create_sort_index(JOIN_TAB *tab,ORDER *order,ha_rows select_limit) |