diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-01-25 13:19:46 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-01-25 13:19:46 +0200 |
| commit | fbd882fca6902e5038bef1d25c1afbfad892d09a (patch) | |
| tree | 088681536e968628003ae711fd14a8df01b404ac /sql/sql_prepare.cc | |
| parent | 433307fafb1bc315a4e92c995f50d052c8d5eb36 (diff) | |
| parent | b23541339c389e452b3d643c249afd4e7fb4899f (diff) | |
| download | mariadb-git-fbd882fca6902e5038bef1d25c1afbfad892d09a.tar.gz | |
merging
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_olap.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 758054a6e48..7c9e4b27564 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -437,6 +437,7 @@ static bool setup_params_data(PREP_STMT *stmt) } /* + Validate the following information for INSERT statement: - field existance - fields count @@ -504,8 +505,9 @@ static bool mysql_test_upd_fields(PREP_STMT *stmt, TABLE_LIST *table_list, if (open_and_lock_tables(thd, table_list)) DBUG_RETURN(1); - if (setup_tables(table_list) || setup_fields(thd,table_list,fields,1,0,0) || - setup_conds(thd,table_list,&conds) || thd->net.report_error) + if (setup_tables(table_list) || + setup_fields(thd, 0, table_list, fields, 1, 0, 0) || + setup_conds(thd, table_list, &conds) || thd->net.report_error) DBUG_RETURN(1); /* |