summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-11-05 10:59:51 +0100
committerSergei Golubchik <sergii@pisem.net>2010-11-05 10:59:51 +0100
commitbc2e383e4a0dbc1949d5b65102e843c01237e23c (patch)
tree23bb774ead6f6cc840c11c0536f3f59c5d417aca /sql/item_timefunc.h
parent4cce72a9292c98fab5628adc24c1635e315444e7 (diff)
parent4cfa91f42c4cde9c35979cd2b9837cb60213d876 (diff)
downloadmariadb-git-bc2e383e4a0dbc1949d5b65102e843c01237e23c.tar.gz
mysql-5.1 -> mysql-5.5 merge
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 6e31b5c6705..27dfd548f73 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -733,7 +733,6 @@ public:
class Item_extract :public Item_int_func
{
- String value;
bool date_value;
public:
const interval_type int_type; // keep it public