Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged

1 files changed, 9 insertions, 9 deletions

diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 29064c82008..850586c6098 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -542,7 +542,7 @@ public:
   void set_limit(st_select_lex *values);
   void set_thd(THD *thd_arg) { thd= thd_arg; }
 
-  friend void lex_start(THD *thd, const uchar *buf, uint length);
+  friend void lex_start(THD *thd, const char *buf, uint length);
   friend int subselect_union_engine::exec();
 
   List<Item> *get_unit_column_types();
@@ -743,7 +743,7 @@ public:
   void cut_subtree() { slave= 0; }
   bool test_limit();
 
-  friend void lex_start(THD *thd, const uchar *buf, uint length);
+  friend void lex_start(THD *thd, const char *buf, uint length);
   st_select_lex() : n_sum_items(0), n_child_sum_items(0) {}
   void make_empty_select()
   {
@@ -996,11 +996,11 @@ typedef struct st_lex : public Query_tables_list
   SELECT_LEX *current_select;
   /* list of all SELECT_LEX */
   SELECT_LEX *all_selects_list;
-  const uchar *buf;		/* The beginning of string, used by SPs */
-  const uchar *ptr,*tok_start,*tok_end,*end_of_query;
+  const char *buf;		/* The beginning of string, used by SPs */
+  const char *ptr,*tok_start,*tok_end,*end_of_query;
   
-  /* The values of tok_start/tok_end as they were one call of MYSQLlex before */
-  const uchar *tok_start_prev, *tok_end_prev;
+  /* The value of tok_start as they were one call of MYSQLlex before */
+  const char *tok_start_prev;
 
   char *length,*dec,*change;
   LEX_STRING name;
@@ -1202,7 +1202,7 @@ typedef struct st_lex : public Query_tables_list
     Pointers to part of LOAD DATA statement that should be rewritten
     during replication ("LOCAL 'filename' REPLACE INTO" part).
   */
-  const uchar *fname_start, *fname_end;
+  const char *fname_start, *fname_end;
 
   /*
     Reference to a struct that contains information in various commands
@@ -1319,10 +1319,10 @@ struct st_lex_local: public st_lex
 
 extern void lex_init(void);
 extern void lex_free(void);
-extern void lex_start(THD *thd, const uchar *buf, uint length);
+extern void lex_start(THD *thd, const char *buf, uint length);
 extern void lex_end(LEX *lex);
 extern int MYSQLlex(void *arg, void *yythd);
-extern const uchar *skip_rear_comments(const uchar *ubegin, const uchar *uend);
+extern const char *skip_rear_comments(const char *ubegin, const char *uend);
 
 extern bool is_lex_native_function(const LEX_STRING *name);