bk commit into 5.2 tree (elliot:1.2273)

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
5.2 repository of emurphy. When emurphy 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, 2006-08-10 10:22:40-04:00, elliot@scared.(none) +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
  into  scared.(none):/home/emurphy/src/mysql/mysql-5.2
  MERGE: 1.2270.1.1

  configure.in@stripped, 2006-08-10 10:22:36-04:00, elliot@scared.(none) +0 -0
    Auto merged
    MERGE: 1.330.1.45

  sql/sql_yacc.yy@stripped, 2006-08-10 10:22:36-04:00, elliot@scared.(none) +0 -0
    Auto merged
    MERGE: 1.458.2.32

# 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:	elliot
# Host:	scared.(none)
# Root:	/home/emurphy/src/mysql/mysql-5.2/RESYNC

--- 1.350/configure.in	2006-08-10 10:22:45 -04:00
+++ 1.351/configure.in	2006-08-10 10:22:45 -04:00
@@ -1687,7 +1687,7 @@
   AC_MSG_ERROR("MySQL needs a long long type.")
 fi
 # off_t is not a builtin type
-MYSQL_CHECK_SIZEOF(off_t, 4)
+AC_CHECK_SIZEOF(off_t, 4)
 if test "$ac_cv_sizeof_off_t" -eq 0
 then
   AC_MSG_ERROR("MySQL needs a off_t type.")

--- 1.470/sql/sql_yacc.yy	2006-08-10 10:22:45 -04:00
+++ 1.471/sql/sql_yacc.yy	2006-08-10 10:22:45 -04:00
@@ -1672,6 +1672,17 @@
 	  {
 	    LEX *lex= Lex;
 	    sp_head *sp= lex->sphead;
+            /*
+              This was disabled in 5.1.12. See bug #20701
+              When collation support in SP is implemented, then this test
+              should be removed.
+            */
+            if (($8 == FIELD_TYPE_STRING || $8 == MYSQL_TYPE_VARCHAR)
+                && (lex->type & BINCMP_FLAG))
+            {
+              my_error(ER_NOT_SUPPORTED_YET, MYF(0), "return value collation");
+              YYABORT;
+            }
 
             if (sp->fill_field_definition(YYTHD, lex,
                                           (enum enum_field_types) $8,