bk commit into 5.0 tree (jimw:1.1927)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1927 05/08/02 16:28:32 jimw@stripped +4 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-11602
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/share/errmsg.txt
    1.37 05/08/02 16:28:30 jimw@stripped +2 -2
    Resolve conflict

  sql/sql_parse.cc
    1.456 05/08/02 16:27:58 jimw@stripped +0 -0
    Auto merged

  sql/sp.cc
    1.85 05/08/02 16:27:58 jimw@stripped +0 -0
    Auto merged

  client/mysqltest.c
    1.153 05/08/02 16:27:58 jimw@stripped +0 -0
    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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.455/sql/sql_parse.cc	2005-08-01 17:54:53 -07:00
+++ 1.456/sql/sql_parse.cc	2005-08-02 16:27:58 -07:00
@@ -4107,6 +4107,12 @@
       delete lex->sphead;
       lex->sphead= 0;
       goto error;
+    case SP_BODY_TOO_LONG:
+      my_error(ER_TOO_LONG_BODY, MYF(0), name);
+      lex->unit.cleanup();
+      delete lex->sphead;
+      lex->sphead= 0;
+      goto error;
     default:
       my_error(ER_SP_STORE_FAILED, MYF(0), SP_TYPE_STRING(lex), name);
       lex->unit.cleanup();

--- 1.36/sql/share/errmsg.txt	2005-07-22 12:38:11 -07:00
+++ 1.37/sql/share/errmsg.txt	2005-08-02 16:28:30 -07:00
@@ -5386,3 +5386,5 @@
 	eng "Trigger in wrong schema"
 ER_STACK_OVERRUN_NEED_MORE
 	eng "Thread stack overrun:  %ld bytes used of a %ld byte stack, and %ld bytes needed.  Use 'mysqld -O thread_stack=#' to specify a bigger stack."
+ER_TOO_LONG_BODY 42000 S1009
+	eng "Routine body for '%-.100s' is too long"

--- 1.152/client/mysqltest.c	2005-07-31 02:49:46 -07:00
+++ 1.153/client/mysqltest.c	2005-08-02 16:27:58 -07:00
@@ -66,7 +66,8 @@
 #ifndef WEXITSTATUS
 # define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
 #endif
-#define MAX_QUERY     131072
+/* MAX_QUERY is 256K -- there is a test in sp-big that is >128K */
+#define MAX_QUERY     (256*1024)
 #define MAX_VAR_NAME	256
 #define MAX_COLUMNS	256
 #define PAD_SIZE	128

--- 1.84/sql/sp.cc	2005-07-28 06:08:52 -07:00
+++ 1.85/sql/sp.cc	2005-08-02 16:27:58 -07:00
@@ -503,6 +503,11 @@
       ret= SP_BAD_IDENTIFIER;
       goto done;
     }
+    if (sp->m_body.length > table->field[MYSQL_PROC_FIELD_BODY]->field_length)
+    {
+      ret= SP_BODY_TOO_LONG;
+      goto done;
+    }
     table->field[MYSQL_PROC_FIELD_DB]->
       store(sp->m_db.str, sp->m_db.length, system_charset_info);
     table->field[MYSQL_PROC_FIELD_NAME]->