bk commit into 5.1 tree (anozdrin:1.2555) BUG#11986

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-14 22:14:52+04:00, anozdrin@ibm. +3 -0
  Part of patch for BUG#11986: make sp_head::m_body_begin pointer
  private and provide a setter for it. The setter will be used to
  construct UTF-query in the following patches.

  sql/sp_head.cc@stripped, 2007-06-14 22:14:49+04:00, anozdrin@ibm. +7 -0
    Make sp_head::m_body_begin pointer private.

  sql/sp_head.h@stripped, 2007-06-14 22:14:49+04:00, anozdrin@ibm. +5 -0
    Make sp_head::m_body_begin pointer private.

  sql/sql_yacc.yy@stripped, 2007-06-14 22:14:49+04:00, anozdrin@ibm. +4 -4
    Make sp_head::m_body_begin pointer private.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	ibm.
# Root:	/home/alik/Documents/MySQL/devel/5.1-rt-cs-6-pre

--- 1.581/sql/sql_yacc.yy	2007-06-14 18:49:14 +04:00
+++ 1.582/sql/sql_yacc.yy	2007-06-14 22:14:49 +04:00
@@ -1872,7 +1872,7 @@
             bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
             lex->sphead->m_chistics= &lex->sp_chistics;
 
-            lex->sphead->m_body_begin= lip->get_cpp_ptr();
+            lex->sphead->set_body_begin_ptr(lip, lip->get_cpp_ptr());
           }
           ev_sql_stmt_inner
           {
@@ -2066,7 +2066,7 @@
             Lex_input_stream *lip= thd->m_lip;
 
 	    lex->sphead->m_chistics= &lex->sp_chistics;
-            lex->sphead->m_body_begin= lip->get_cpp_tok_start();
+            lex->sphead->set_body_begin_ptr(lip, lip->get_cpp_tok_start());
 	  }
 	  sp_proc_stmt
 	  {
@@ -11489,7 +11489,7 @@
 
 	  bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
 	  lex->sphead->m_chistics= &lex->sp_chistics;
-          lex->sphead->m_body_begin= lip->get_cpp_ptr();
+          lex->sphead->set_body_begin_ptr(lip, lip->get_cpp_ptr());
 	}
         sp_proc_stmt /* $16 */
         { /* $17 */
@@ -11592,7 +11592,7 @@
           Lex_input_stream *lip= thd->m_lip;
 
 	  lex->sphead->m_chistics= &lex->sp_chistics;
-          lex->sphead->m_body_begin= lip->get_cpp_tok_start();
+          lex->sphead->set_body_begin_ptr(lip, lip->get_cpp_tok_start());
 	}
 	sp_proc_stmt
 	{

--- 1.278/sql/sp_head.cc	2007-06-14 19:23:52 +04:00
+++ 1.279/sql/sp_head.cc	2007-06-14 22:14:49 +04:00
@@ -2054,6 +2054,13 @@
 
 
 void
+sp_head::set_body_begin_ptr(Lex_input_stream *lip, const char *begin_ptr)
+{
+  m_body_begin= begin_ptr;
+}
+
+
+void
 sp_head::set_definer(const char *definer, uint definerlen)
 {
   char user_name_holder[USERNAME_LENGTH + 1];

--- 1.110/sql/sp_head.h	2007-06-14 19:23:52 +04:00
+++ 1.111/sql/sp_head.h	2007-06-14 22:14:49 +04:00
@@ -178,8 +178,11 @@
   // Pointers set during parsing
   const char *m_param_begin;
   const char *m_param_end;
+
+private:
   const char *m_body_begin;
 
+public:
   /*
     Security context for stored routine which should be run under
     definer privileges.
@@ -296,6 +299,8 @@
 
   void set_info(longlong created, longlong modified,
 		st_sp_chistics *chistics, ulong sql_mode);
+
+  void set_body_begin_ptr(Lex_input_stream *lip, const char *begin_ptr);
 
   void set_definer(const char *definer, uint definerlen);
   void set_definer(const LEX_STRING *user_name, const LEX_STRING *host_name);