From e5d6b0afd223b21ae5f52efd67b64ff3884a2862 Mon Sep 17 00:00:00 2001
From: "kostja@bodhi.local" <>
Date: Tue, 27 Mar 2007 21:57:33 +0400
Subject: [PATCH] Fix warnings.

---
 include/typelib.h | 2 +-
 mysys/typelib.c   | 2 +-
 sql/item_func.cc  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/typelib.h b/include/typelib.h
index 79d3acd2d64..e04ec20f2bc 100644
--- a/include/typelib.h
+++ b/include/typelib.h
@@ -26,7 +26,7 @@ typedef struct st_typelib {	/* Different types saved here */
   unsigned int *type_lengths;
 } TYPELIB;
 
-extern int find_type(const char *x, const TYPELIB *typelib,
+extern int find_type(char *x, const TYPELIB *typelib,
                      unsigned int full_name);
 extern void make_type(char *to,unsigned int nr,TYPELIB *typelib);
 extern const char *get_type(TYPELIB *typelib,unsigned int nr);
diff --git a/mysys/typelib.c b/mysys/typelib.c
index 97b03b72b24..dc9f0850bbc 100644
--- a/mysys/typelib.c
+++ b/mysys/typelib.c
@@ -42,7 +42,7 @@
     >0  Offset+1 in typelib for matched string
 */
 
-int find_type(const char *x, const TYPELIB *typelib, uint full_name)
+int find_type(char *x, const TYPELIB *typelib, uint full_name)
 {
   int find,pos,findpos;
   reg1 my_string i;
diff --git a/sql/item_func.cc b/sql/item_func.cc
index cf3a4d3d758..59894c981af 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -5069,7 +5069,7 @@ Item_func_sp::init_result_field(THD *thd)
 {
   DBUG_ENTER("Item_func_sp::init_result_field");
 
-  LEX_STRING empty_name= { STRING_WITH_LEN("") };
+  LEX_STRING empty_name= { C_STRING_WITH_LEN("") };
   
   TABLE_SHARE *share;