diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.cc | 6 | ||||
| -rw-r--r-- | sql/item_func.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sql/field.cc b/sql/field.cc index 5afa314b835..4ef95d6e102 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -2620,9 +2620,9 @@ bool Field_time::get_time(TIME *ltime) ltime->neg= 1; tmp=-tmp; } - ltime->day=tmp/10000; - tmp-=ltime->day*10000; - ltime->hour= tmp/100; + ltime->hour=tmp/10000; + tmp-=ltime->hour*10000; + ltime->minute= tmp/100; ltime->second= tmp % 100; ltime->second_part=0; return 0; diff --git a/sql/item_func.h b/sql/item_func.h index 4af3e604f38..0eae4512ab4 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -848,7 +848,8 @@ public: { if (!master) { - ft_close_search(ft_handler); + if (ft_handler) + ft_close_search(ft_handler); if(join_key) table->file->ft_handler=0; } |