diff options
| author | bell@sanja.is.com.ua <> | 2004-09-04 15:32:13 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-09-04 15:32:13 +0300 |
| commit | 161662ba4c8747ef13cfa9e26f469c5715ba7888 (patch) | |
| tree | 429e20da4fbabeb9cee6a07bfdec79596e08ad53 /sql/sql_update.cc | |
| parent | 3cdb85a08ce03043c654be78b8229145b841fc14 (diff) | |
| parent | 32594c99899edd6de0053609c087f04dc21fbbfd (diff) | |
| download | mariadb-git-161662ba4c8747ef13cfa9e26f469c5715ba7888.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index a27244e1055..9d7134aee84 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -496,7 +496,7 @@ int mysql_prepare_update(THD *thd, TABLE_LIST *table_list, DBUG_RETURN(-1); /* Check that we are not using table that we are updating in a sub select */ - if (find_real_table_in_list(table_list->next_global, + if (find_table_in_global_list(table_list->next_global, table_list->db, table_list->real_name)) { my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->real_name); @@ -788,7 +788,7 @@ int multi_update::prepare(List<Item> ¬_used_values, { TABLE *table=table_ref->table; if (!(tables_to_update & table->map) && - find_real_table_in_list(update_tables, table_ref->db, + find_table_in_global_list(update_tables, table_ref->db, table_ref->real_name)) table->no_cache= 1; // Disable row cache } |