Commit ac3219dc authored by unknown's avatar unknown

bug fixed (sometimes it broke filesort, due to too late maybe_null=1)


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
BitKeeper/etc/ignore:
  Added myisam/test1.MYD myisam/test1.MYI to the ignore list
parent c0e6d9df
...@@ -287,3 +287,5 @@ support-files/mysql.server ...@@ -287,3 +287,5 @@ support-files/mysql.server
support-files/mysql.spec support-files/mysql.spec
tags tags
tmp/* tmp/*
myisam/test1.MYD
myisam/test1.MYI
...@@ -8,3 +8,4 @@ mwagner@evoq.mwagner.org ...@@ -8,3 +8,4 @@ mwagner@evoq.mwagner.org
paul@central.snake.net paul@central.snake.net
paul@teton.kitebird.com paul@teton.kitebird.com
sasha@mysql.sashanet.com sasha@mysql.sashanet.com
serg@serg.mysql.com
...@@ -1951,6 +1951,9 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist) ...@@ -1951,6 +1951,9 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist)
List_iterator<Item> li(fields); List_iterator<Item> li(fields);
Item *item; Item *item;
maybe_null=1;
join_key=0;
/* Why testing for const_item ? Monty */ /* Why testing for const_item ? Monty */
/* I'll remove it later, but this should include modifications to /* I'll remove it later, but this should include modifications to
find_best and auto_close as complement to auto_init code above. SerG */ find_best and auto_close as complement to auto_init code above. SerG */
...@@ -2044,8 +2047,6 @@ bool Item_func_match::fix_index() ...@@ -2044,8 +2047,6 @@ bool Item_func_match::fix_index()
continue; continue;
this->key=ft_to_key[key]; this->key=ft_to_key[key];
maybe_null=1;
join_key=0;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment