diff options
author | unknown <monty@mashka.mysql.fi> | 2002-11-12 12:42:42 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-11-12 12:42:42 +0200 |
commit | e1c1abd0e189e4581b9a22aed923df37e535e89b (patch) | |
tree | 64ca040d65207f67531780b5d412e720c122c372 /sql/item_cmpfunc.h | |
parent | 3165440cdec9d1270a2101973cb75e67e334dc5c (diff) | |
download | mariadb-git-e1c1abd0e189e4581b9a22aed923df37e535e89b.tar.gz |
Extended WEEK() to be able to handle ISO weeks.
unlink socket file if mysqld dies on startup
Some optimization of AND expressions
mysql-test/r/func_time.result:
Update for new week() handling
mysql-test/t/func_time.test:
Update for new week() handling
sql/item_cmpfunc.cc:
Optimization of IF( and-expression,,)
sql/item_cmpfunc.h:
Optimization of AND expressions
sql/item_timefunc.cc:
Extended WEEK() to be able to handle ISO weeks.
sql/mysqld.cc:
unlink socket file if mysqld dies on startup
sql/sql_base.cc:
Fixed problem with SIGHUP and INSERT DELAYED
tests/Makefile.am:
Added missing myisam-big-rows.tst file to source distribution
Diffstat (limited to 'sql/item_cmpfunc.h')
-rw-r--r-- | sql/item_cmpfunc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index f2c0ee403d2..e163bc40a6e 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -216,6 +216,11 @@ public: longlong val_int(); String *val_str(String *str); enum Item_result result_type () const { return cached_result_type; } + bool fix_fields(THD *thd,struct st_table_list *tlist) + { + args[0]->top_level_item(); + return Item_func::fix_fields(thd,tlist); + } void fix_length_and_dec(); const char *func_name() const { return "if"; } unsigned int size_of() { return sizeof(*this);} |