bk commit into 5.0 tree (df:1.2487)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.0 repository of df. When df 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-06-18 13:49:01+02:00, df@stripped +4 -0
  Merge dev:/data0/mysqldev/my/build-200706140748-5.0.44/mysql-5.0-i5
  into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.44-i5os
  MERGE: 1.2475.43.2

  mysql-test/r/view_grant.result@stripped, 2007-06-18 13:48:57+02:00, df@stripped +0 -2
    Auto merged
    MERGE: 1.24.1.1

  sql/field.cc@stripped, 2007-06-18 13:48:58+02:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.349.1.2

  sql/field.h@stripped, 2007-06-18 13:48:58+02:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.204.1.1

  sql/sql_acl.cc@stripped, 2007-06-18 13:48:58+02:00, df@stripped +0 -7
    Auto merged
    MERGE: 1.220.1.1

# 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:	df
# Host:	pippilotta.erinye.com
# Root:	/shared/home/df/mysql/build/mysql-5.0.44-i5os/RESYNC

--- 1.353/sql/field.cc	2007-06-14 13:37:34 +02:00
+++ 1.354/sql/field.cc	2007-06-18 13:48:58 +02:00
@@ -6267,6 +6267,7 @@
   is 2.
 ****************************************************************************/
 
+const uint Field_varstring::MAX_SIZE= UINT_MAX16;
 
 int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs)
 {

--- 1.206/sql/field.h	2007-06-14 13:37:34 +02:00
+++ 1.207/sql/field.h	2007-06-18 13:48:58 +02:00
@@ -1116,7 +1116,7 @@
     The maximum space available in a Field_varstring, in bytes. See
     length_bytes.
   */
-  static const uint MAX_SIZE= UINT_MAX16;
+  static const uint MAX_SIZE;
   /* Store number of bytes used to store length (1 or 2) */
   uint32 length_bytes;
   Field_varstring(char *ptr_arg,