diff options
| author | unknown <kostja@bodhi.(none)> | 2008-05-20 11:38:17 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2008-05-20 11:38:17 +0400 |
| commit | 4175806efca7644c41ab77e5a8f07d1cc5a1ac00 (patch) | |
| tree | c2c65314fdd8ac05f82de10701ce5eb6a9856e11 /sql/sql_update.cc | |
| parent | 41116166257e92df96c394035c8b580e48626b00 (diff) | |
| parent | 4b13b5cb34de81942d52173663031fb119d5b8e1 (diff) | |
| download | mariadb-git-4175806efca7644c41ab77e5a8f07d1cc5a1ac00.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-27430
Makefile.am:
Auto merged
include/my_global.h:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
sql/item.cc:
Auto merged
sql/my_decimal.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
libmysqld/CMakeLists.txt:
Manual merge.
libmysqld/lib_sql.cc:
Manual merge.
mysql-test/t/disabled.def:
Manual merge.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 9d6a2b1b8c8..bfb71db22da 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -853,8 +853,9 @@ bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list, Item **conds, uint order_num, ORDER *order) { Item *fake_conds= 0; +#ifndef NO_EMBEDDED_ACCESS_CHECKS TABLE *table= table_list->table; - TABLE_LIST tables; +#endif List<Item> all_fields; SELECT_LEX *select_lex= &thd->lex->select_lex; DBUG_ENTER("mysql_prepare_update"); @@ -878,9 +879,6 @@ bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list, table_list->register_want_access(SELECT_ACL); #endif - bzero((char*) &tables,sizeof(tables)); // For ORDER BY - tables.table= table; - tables.alias= table_list->alias; thd->lex->allow_sum_func= 0; if (setup_tables_and_check_access(thd, &select_lex->context, |