mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
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
This commit is contained in:
parent
c0e6d9df4a
commit
ac3219dc65
3 changed files with 6 additions and 2 deletions
|
@ -287,3 +287,5 @@ support-files/mysql.server
|
|||
support-files/mysql.spec
|
||||
tags
|
||||
tmp/*
|
||||
myisam/test1.MYD
|
||||
myisam/test1.MYI
|
||||
|
|
|
@ -8,3 +8,4 @@ mwagner@evoq.mwagner.org
|
|||
paul@central.snake.net
|
||||
paul@teton.kitebird.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)
|
|||
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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue