bk commit into 5.2 tree (reggie:1.2157)

[reggie]

Below is the list of changes that have just been committed into a local
5.2 repository of reggie. When reggie 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.2157 06/02/22 14:22:56 reggie@stripped +3 -0
  Merge linux.site:/home/reggie/work/mysql-5.1
  into  linux.site:/home/reggie/work/mysql-5.2

  sql/sql_yacc.yy
    1.463 06/02/22 14:22:45 reggie@stripped +0 -0
    Auto merged

  sql/share/errmsg.txt
    1.83 06/02/22 14:22:45 reggie@stripped +0 -0
    Auto merged

  configure.in
    1.339 06/02/22 14:22:44 reggie@stripped +0 -1
    Auto merged

# 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:	reggie
# Host:	linux.site
# Root:	/home/reggie/work/mysql-5.2/RESYNC

--- 1.462/sql/sql_yacc.yy	2006-02-21 17:45:35 -06:00
+++ 1.463/sql/sql_yacc.yy	2006-02-22 14:22:45 -06:00
@@ -1679,6 +1679,16 @@
 	    LEX *lex= Lex;
 	    sp_head *sp;
 
+            /* 
+              First check if AGGREGATE was used, in that case it's a
+              syntax error.
+            */
+            if (lex->udf.type == UDFTYPE_AGGREGATE)
+            {
+              my_error(ER_SP_NO_AGGREGATE, MYF(0));
+              YYABORT;
+            }
+
 	    if (lex->sphead)
 	    {
 	      my_error(ER_SP_NO_RECURSIVE_CREATE, MYF(0), "FUNCTION");

--- 1.82/sql/share/errmsg.txt	2006-02-21 17:45:35 -06:00
+++ 1.83/sql/share/errmsg.txt	2006-02-22 14:22:45 -06:00
@@ -5660,8 +5660,8 @@
         eng "For the partitioned engine it is necessary to define all %-.64s"
 ER_TOO_MANY_PARTITIONS_ERROR
-        eng "Too many partitions were defined"
+        eng "Too many partitions (including subpartitions) were defined"
 ER_SUBPARTITION_ERROR
         eng "It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning"
@@ -5813,3 +5813,7 @@
 ER_WARN_DEPRECATED_STATEMENT
         eng  "The '%s' statement is deprecated and will be removed in MySQL %s. Please use client programs (e.g. %s) instead."
 
+ER_TABLE_NEEDS_UPGRADE
+         eng "Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" to fix it!"
+ER_SP_NO_AGGREGATE 42000
+	eng "AGGREGATE is not supported for stored functions"