bk commit into 5.1 tree (kostja:1.2518)

[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 20:27:58+04:00, kostja@stripped +5 -0
  Change find_type family to accept const TYPELIB*.

  include/mysql_h.ic@stripped, 2007-03-27 20:27:35+04:00, kostja@stripped +1 -1
    Change find_type family to accept const TYPELIB*.
    This sort of change can not break the ABI.

  include/typelib.h@stripped, 2007-03-27 20:27:36+04:00, kostja@stripped +2 -1
    Change find_type family to accept const TYPELIB*.

  mysys/typelib.c@stripped, 2007-03-27 20:27:36+04:00, kostja@stripped +1 -1
    Change find_type family to accept const TYPELIB*.

  sql/mysql_priv.h@stripped, 2007-03-27 20:27:36+04:00, kostja@stripped +4 -2
    Change find_type family to accept const TYPELIB*.

  sql/strfunc.cc@stripped, 2007-03-27 20:27:36+04:00, kostja@stripped +4 -2
    Change find_type family to accept const TYPELIB*.

# 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.18/mysys/typelib.c	2007-01-11 16:09:57 +03:00
+++ 1.19/mysys/typelib.c	2007-03-27 20:27:36 +04:00
@@ -42,7 +42,7 @@
     >0  Offset+1 in typelib for matched string
 */
 
-int find_type(my_string x, TYPELIB *typelib, uint full_name)
+int find_type(const char *x, const TYPELIB *typelib, uint full_name)
 {
   int find,pos,findpos;
   reg1 my_string i;

--- 1.490/sql/mysql_priv.h	2007-03-20 00:37:30 +03:00
+++ 1.491/sql/mysql_priv.h	2007-03-27 20:27:36 +04:00
@@ -1561,8 +1561,10 @@
 /* strfunc.cc */
 ulonglong find_set(TYPELIB *lib, const char *x, uint length, CHARSET_INFO *cs,
 		   char **err_pos, uint *err_len, bool *set_warning);
-uint find_type(TYPELIB *lib, const char *find, uint length, bool part_match);
-uint find_type2(TYPELIB *lib, const char *find, uint length, CHARSET_INFO *cs);
+uint find_type(const TYPELIB *lib, const char *find, uint length,
+               bool part_match);
+uint find_type2(const TYPELIB *lib, const char *find, uint length,
+                CHARSET_INFO *cs);
 void unhex_type2(TYPELIB *lib);
 uint check_word(TYPELIB *lib, const char *val, const char *end,
 		const char **end_of_word);

--- 1.14/sql/strfunc.cc	2006-12-23 22:19:56 +03:00
+++ 1.15/sql/strfunc.cc	2007-03-27 20:27:36 +04:00
@@ -104,7 +104,8 @@
   > 0 position in TYPELIB->type_names +1
 */
 
-uint find_type(TYPELIB *lib, const char *find, uint length, bool part_match)
+uint find_type(const TYPELIB *lib, const char *find, uint length,
+               bool part_match)
 {
   uint found_count=0, found_pos=0;
   const char *end= find+length;
@@ -144,7 +145,8 @@
     >0  Offset+1 in typelib for matched string
 */
 
-uint find_type2(TYPELIB *typelib, const char *x, uint length, CHARSET_INFO *cs)
+uint find_type2(const TYPELIB *typelib, const char *x, uint length,
+                CHARSET_INFO *cs)
 {
   int pos;
   const char *j;

--- 1.6/include/typelib.h	2007-01-11 16:09:57 +03:00
+++ 1.7/include/typelib.h	2007-03-27 20:27:36 +04:00
@@ -26,7 +26,8 @@
   unsigned int *type_lengths;
 } TYPELIB;
 
-extern int find_type(char *x,TYPELIB *typelib,unsigned int full_name);
+extern int find_type(const 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);
 extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from);

--- 1.10/include/mysql_h.ic	2006-12-22 02:39:04 +03:00
+++ 1.11/include/mysql_h.ic	2007-03-27 20:27:35 +04:00
@@ -638,7 +638,7 @@
 # 415 "mysql_com.h"
 extern void create_random_string(char * to, unsigned int, struct rand_struct * rand_st);
 # 30 "typelib.h"
-extern int find_type(char * x, TYPELIB * typelib, unsigned int);
+extern int find_type(char * x, const TYPELIB * typelib, unsigned int);
 # 429 "mysql_com.h"
 extern void get_salt_from_password(unsigned char * res, char const * password);
 # 422 "mysql_com.h"