bk commit into 5.0 tree (pem:1.2043) BUG#17015

[pem]

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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
  1.2043 06/03/28 15:06:06 pem@stripped +2 -0
  Review fix for BUG#17015: Routine name truncation not an error

  sql/sp.cc
    1.108 06/03/28 15:06:00 pem@stripped +4 -5
    Use Field::char_length() to check number of characters in the name field.

  sql/field.h
    1.172 06/03/28 15:06:00 pem@stripped +6 -0
    Added new method to Field class: char_length()

# 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:	pem
# Host:	pem.mysql.com
# Root:	/extern/mysql/5.0/bug17015/mysql-5.0-runtime

--- 1.171/sql/field.h	2006-01-03 18:04:31 +01:00
+++ 1.172/sql/field.h	2006-03-28 15:06:00 +02:00
@@ -319,6 +319,12 @@
   /* convert decimal to longlong with overflow check */
   longlong convert_decimal2longlong(const my_decimal *val, bool unsigned_flag,
                                     int *err);
+  /* The max. number of characters */
+  inline uint32 Field::char_length() const
+  {
+    return field_length / charset()->mbmaxlen;
+  }
+
   friend bool reopen_table(THD *,struct st_table *,bool);
   friend int cre_myisam(my_string name, register TABLE *form, uint options,
 			ulonglong auto_increment_value);

--- 1.107/sql/sp.cc	2006-02-16 13:40:34 +01:00
+++ 1.108/sql/sp.cc	2006-03-28 15:06:00 +02:00
@@ -509,11 +509,10 @@
       goto done;
     }
 
-    if ((system_charset_info->cset->numchars(system_charset_info,
-                                             sp->m_name.str,
-                                             sp->m_name.str+sp->m_name.length) *
-         table->field[MYSQL_PROC_FIELD_NAME]->charset()->mbmaxlen) >
-        table->field[MYSQL_PROC_FIELD_NAME]->field_length)
+    if (system_charset_info->cset->numchars(system_charset_info,
+                                            sp->m_name.str,
+                                            sp->m_name.str+sp->m_name.length) >
+        table->field[MYSQL_PROC_FIELD_NAME]->char_length())
     {
       ret= SP_BAD_IDENTIFIER;
       goto done;