One more resolving because of pending log functions changes. Not sure if the manual is merged correctly again. Will ask arjen to check as soon as LOG changes will be pushed

sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 20 insertions, 0 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 6ecbc04ddf0..184a5e5fbe9 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -342,15 +342,35 @@ public:
   const char *func_name() const { return "exp"; }
 };
 
+
+class Item_func_ln :public Item_dec_func
+{
+public:
+  Item_func_ln(Item *a) :Item_dec_func(a) {}
+  double val();
+  const char *func_name() const { return "ln"; }
+};
+
+
 class Item_func_log :public Item_dec_func
 {
 public:
   Item_func_log(Item *a) :Item_dec_func(a) {}
+  Item_func_log(Item *a,Item *b) :Item_dec_func(a,b) {}
   double val();
   const char *func_name() const { return "log"; }
 };
 
 
+class Item_func_log2 :public Item_dec_func
+{
+public:
+  Item_func_log2(Item *a) :Item_dec_func(a) {}
+  double val();
+  const char *func_name() const { return "log2"; }
+};
+
+
 class Item_func_log10 :public Item_dec_func
 {
 public: