diff options
| author | unknown <jimw@mysql.com> | 2005-08-02 16:50:12 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-02 16:50:12 -0700 |
| commit | 1ea0632e6c425e8b2094b551439dca0df439e864 (patch) | |
| tree | 8f42f5271e4c2ede105a05c9472da1d158f05ee0 /sql/sp.cc | |
| parent | 6ea67532cc7c76d2b82c1ccb1e36a651a8d2722f (diff) | |
| parent | eb25e83ee4a2b960a387778a19440b6db4a01fd7 (diff) | |
| download | mariadb-git-1ea0632e6c425e8b2094b551439dca0df439e864.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-11602
into mysql.com:/home/jimw/my/mysql-5.0-clean
client/mysqltest.c:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
Resolve conflict
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index dec0eee0095..dfe3493528f 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -503,6 +503,11 @@ db_create_routine(THD *thd, int type, sp_head *sp) 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]-> |