diff options
| author | unknown <hf@deer.(none)> | 2004-01-19 21:06:27 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-01-19 21:06:27 +0400 |
| commit | b44c819bb61664b4b69680c0209b8627b40fe2b2 (patch) | |
| tree | 68d020ad65ffc40d49179abe19fb94245bfbf5d6 /sql/sql_prepare.cc | |
| parent | 584e137887326584e1f24d2061e75486d745584e (diff) | |
| parent | 9af09d1266c5a354e6126f13feaea0a3680442d3 (diff) | |
| download | mariadb-git-b44c819bb61664b4b69680c0209b8627b40fe2b2.tar.gz | |
Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-4.1.1676
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index b5dd4083dcf..de0d0c8aca8 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -679,7 +679,7 @@ static bool mysql_test_upd_fields(Prepared_statement *stmt, #endif if (open_and_lock_tables(thd, table_list)) DBUG_RETURN(1); - if (setup_tables(table_list) || + if (setup_tables(table_list, 0) || setup_fields(thd, 0, table_list, fields, 1, 0, 0) || setup_conds(thd, table_list, &conds) || thd->net.report_error) DBUG_RETURN(1); |