diff options
| author | unknown <anozdrin/alik@ibm.> | 2007-07-27 21:30:43 +0400 |
|---|---|---|
| committer | unknown <anozdrin/alik@ibm.> | 2007-07-27 21:30:43 +0400 |
| commit | 4596ef83e7705c8d8ff408eaa9fb930a43775171 (patch) | |
| tree | 77417998cc4a176a743cb99b4445355f370bc033 /sql | |
| parent | 818b0b84e0268e38a563dcf2c6ce0c3c2cf2f7f7 (diff) | |
| parent | 2612fc43b53a69320ba41011aa632ec35b734211 (diff) | |
| download | mariadb-git-4596ef83e7705c8d8ff408eaa9fb930a43775171.tar.gz | |
Merge ibm.:/home/alik/Documents/MySQL/devel/5.0-rt
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merge
mysql-test/r/mysqldump-max.result:
Auto merged
mysql-test/r/openssl_1.result:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
client/mysqldump.c:
Manual merge.
mysql-test/r/mysqldump.result:
Manual merge + use local.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sp.cc | 4 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
2 files changed, 3 insertions, 3 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; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index d9a808bf8f7..81bb1c2dae9 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7277,7 +7277,7 @@ join_table: so that [INNER | CROSS] JOIN is properly nested as other left-associative joins. */ - table_ref %prec TABLE_REF_PRIORITY normal_join table_ref + table_ref normal_join table_ref %prec TABLE_REF_PRIORITY { MYSQL_YYABORT_UNLESS($1 && ($$=$3)); } | table_ref STRAIGHT_JOIN table_factor { MYSQL_YYABORT_UNLESS($1 && ($$=$3)); $3->straight=1; } |