Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0

into ram.(none):/home/ram/work/mysql-4.0


sql/item_strfunc.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 9 insertions, 0 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 618a6f56bcf..3bbec149e9c 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -526,3 +526,12 @@ public:
   const char *func_name() const { return "inet_ntoa"; }
   void fix_length_and_dec() { decimals = 0; max_length=3*8+7; }
 };
+
+class Item_func_quote :public Item_str_func
+{
+public:
+  Item_func_quote(Item *a) :Item_str_func(a) {}
+  const char *func_name() const { return "quote"; }
+  String *val_str(String *);
+  void fix_length_and_dec() { max_length= args[0]->max_length * 2 + 2; }
+};