diff options
| author | anozdrin/alik@ibm. <> | 2007-07-27 21:30:43 +0400 |
|---|---|---|
| committer | anozdrin/alik@ibm. <> | 2007-07-27 21:30:43 +0400 |
| commit | af9e57562dcd784bc75525292288b0a9d9973682 (patch) | |
| tree | 77417998cc4a176a743cb99b4445355f370bc033 /sql/sp.cc | |
| parent | 04047d966646bcf519005a0cd854072885948122 (diff) | |
| parent | 9f8593e81c99425a028d416854a172543a6f706d (diff) | |
| download | mariadb-git-af9e57562dcd784bc75525292288b0a9d9973682.tar.gz | |
Merge ibm.:/home/alik/Documents/MySQL/devel/5.0-rt
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merge
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index aed4976f839..335811000c2 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -406,7 +406,7 @@ db_find_routine(THD *thd, int type, sp_name *name, sp_head **sphp) if ((ret= db_find_routine_aux(thd, type, name, table)) != SP_OK) goto done; - if (table->s->fields != MYSQL_PROC_FIELD_COUNT) + if (table->s->fields < MYSQL_PROC_FIELD_COUNT) { ret= SP_GET_FIELD_FAILED; goto done; @@ -695,7 +695,7 @@ sp_create_routine(THD *thd, int type, sp_head *sp) strxnmov(definer, sizeof(definer)-1, thd->lex->definer->user.str, "@", thd->lex->definer->host.str, NullS); - if (table->s->fields != MYSQL_PROC_FIELD_COUNT) + if (table->s->fields < MYSQL_PROC_FIELD_COUNT) { ret= SP_GET_FIELD_FAILED; goto done; |