summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-12-19 16:25:50 +0200
committermonty@mysql.com <>2003-12-19 16:25:50 +0200
commit031390a9a4904924c21929314dcd42886c84c175 (patch)
tree87e8ff9b43e2e71fc79bfa2e296018b89b08a9e1 /sql/item_func.h
parente0cc6799ecc831d296c568c5068947c1421fcaa5 (diff)
downloadmariadb-git-031390a9a4904924c21929314dcd42886c84c175.tar.gz
Fixes after merge with 4.0
Cleaned up embedded library access and query cache handling Changed min stack size to 128K (to allow longer MyISAM keys) Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 739110fd81f..ac67b5a4065 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -717,9 +717,10 @@ public:
Item_func_bit_neg(Item *a) :Item_func_bit(a) {}
longlong val_int();
const char *func_name() const { return "~"; }
- void print(String *str) { Item_func_int::print(str); }
+ void print(String *str) { Item_func::print(str); }
};
+
class Item_func_set_last_insert_id :public Item_int_func
{
public: