diff options
| author | unknown <dlenev@mysql.com> | 2005-03-04 17:46:45 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-03-04 17:46:45 +0300 |
| commit | b1095fb0cd0b42158f6ca3d8f157df5d23bec423 (patch) | |
| tree | bff7a84c42deaf288f2aee7fdb2011a47b92ba6c /sql/sql_update.cc | |
| parent | d6949b3e9f8164e28bb24b7c1d948cdce12db005 (diff) | |
| parent | ac9f68b9fac716ebc09b9f31b4348b0db135519b (diff) | |
| download | mariadb-git-b1095fb0cd0b42158f6ca3d8f157df5d23bec423.tar.gz | |
Manual merge SP-locking improvements patch with current tree.
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.h:
Auto merged
sql/sp_head.cc:
Manual merge.
sql/sql_class.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
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 54a976fe2b0..477a283448a 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -136,7 +136,7 @@ int mysql_update(THD *thd, LINT_INIT(timestamp_query_id); - if (open_tables(thd, table_list, &table_count)) + if (open_tables(thd, &table_list, &table_count)) DBUG_RETURN(1); if (table_list->ancestor && table_list->ancestor->next_local) @@ -635,7 +635,7 @@ bool mysql_multi_update_prepare(THD *thd) thd->lex->sql_command= SQLCOM_UPDATE_MULTI; /* open tables and create derived ones, but do not lock and fill them */ - if ((original_multiupdate && open_tables(thd, table_list, & table_count)) || + if ((original_multiupdate && open_tables(thd, &table_list, & table_count)) || mysql_handle_derived(lex, &mysql_derived_prepare)) DBUG_RETURN(TRUE); /* |