bk commit into 5.1 tree (kostja:1.2522)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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-03-27 21:57:33+04:00, kostja@stripped +3 -0
  Fix warnings.

  include/typelib.h@stripped, 2007-03-27 21:57:29+04:00, kostja@stripped +1 -1
    Fix a compile warning. char *x is actually updated if
    it's found in the typelib (a peculiar way to return
    canonical value in case of a partial match)

  mysys/typelib.c@stripped, 2007-03-27 21:57:29+04:00, kostja@stripped +1 -1
    Fix a warning.

  sql/item_func.cc@stripped, 2007-03-27 21:57:29+04:00, kostja@stripped +1 -1
    Fix a compile-time warning.

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-c1

--- 1.19/mysys/typelib.c	2007-03-27 20:27:36 +04:00
+++ 1.20/mysys/typelib.c	2007-03-27 21:57:29 +04:00
@@ -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;

--- 1.369/sql/item_func.cc	2007-03-27 20:08:07 +04:00
+++ 1.370/sql/item_func.cc	2007-03-27 21:57:29 +04:00
@@ -5069,7 +5069,7 @@
 {
   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;
 

--- 1.7/include/typelib.h	2007-03-27 20:27:36 +04:00
+++ 1.8/include/typelib.h	2007-03-27 21:57:29 +04:00
@@ -26,7 +26,7 @@
   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);