5.3->5.5 merge

1 files changed, 9 insertions, 0 deletions

diff --git a/sql/gstream.h b/sql/gstream.h
index 533fafa28f3..f10b7e9b830 100644
--- a/sql/gstream.h
+++ b/sql/gstream.h
@@ -46,6 +46,7 @@ public:
   }
 
   enum enum_tok_types get_next_toc_type();
+  bool lookup_next_word(LEX_STRING *res);
   bool get_next_word(LEX_STRING *);
   bool get_next_number(double *);
   bool check_next_symbol(char);
@@ -64,6 +65,14 @@ public:
     m_cur++;
     return 0;
   }
+  /* Returns the next notempty character. */
+  char next_symbol() 
+  {
+    skip_space();
+    if (m_cur >= m_limit)
+      return 0;                                 /* EOL meet. */
+    return *m_cur;
+  }
   void set_error_msg(const char *msg);
 
   // caller should free this pointer