mirror of
https://github.com/MariaDB/server.git
synced 2026-05-04 14:15:33 +02:00
merged
man/perror.1: Auto merged scripts/mysqld_safe.sh: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/item.cc: Auto merged sql/sql_select.cc: Auto merged strings/ctype-tis620.c: Auto merged mysql-test/r/analyse.result: ul mysql-test/r/group_by.result: ul mysql-test/r/select.result: ul
This commit is contained in:
commit
50da5c1858
11 changed files with 106 additions and 53 deletions
11
sql/item.cc
11
sql/item.cc
|
|
@ -195,6 +195,17 @@ bool Item_field::get_date(TIME *ltime,bool fuzzydate)
|
|||
return 0;
|
||||
}
|
||||
|
||||
bool Item_field::get_date_result(TIME *ltime,bool fuzzydate)
|
||||
{
|
||||
if ((null_value=result_field->is_null()) ||
|
||||
result_field->get_date(ltime,fuzzydate))
|
||||
{
|
||||
bzero((char*) ltime,sizeof(*ltime));
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool Item_field::get_time(TIME *ltime)
|
||||
{
|
||||
if ((null_value=field->is_null()) || field->get_time(ltime))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue