diff options
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/item_func.cc | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index e49294554cb..1683e4d7a22 100644 --- a/.bzrignore +++ b/.bzrignore @@ -287,3 +287,5 @@ support-files/mysql.server support-files/mysql.spec tags tmp/* +myisam/test1.MYD +myisam/test1.MYI diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 918f5178951..af4fd3e0122 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -8,3 +8,4 @@ mwagner@evoq.mwagner.org paul@central.snake.net paul@teton.kitebird.com sasha@mysql.sashanet.com +serg@serg.mysql.com diff --git a/sql/item_func.cc b/sql/item_func.cc index 8a2bd15ae6d..e540f850063 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1951,6 +1951,9 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist) List_iterator<Item> li(fields); Item *item; + maybe_null=1; + join_key=0; + /* Why testing for const_item ? Monty */ /* I'll remove it later, but this should include modifications to find_best and auto_close as complement to auto_init code above. SerG */ @@ -2044,8 +2047,6 @@ bool Item_func_match::fix_index() continue; this->key=ft_to_key[key]; - maybe_null=1; - join_key=0; return 0; } |