diff options
| author | unknown <gshchepa/uchum@host.loc> | 2008-03-27 15:52:55 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@host.loc> | 2008-03-27 15:52:55 +0400 |
| commit | 11cfd2ed67ddce51e6fe0b357a660557aa372ffb (patch) | |
| tree | 799a5f4f3ff09f0fd91eaac22493bded4eb38a8c /sql/sql_update.cc | |
| parent | 4816e7b7fbd9a035aab92fbebf3ffa065612289e (diff) | |
| parent | c3f2e30320f31d654fecb0bf2eabf66e64685b89 (diff) | |
| download | mariadb-git-11cfd2ed67ddce51e6fe0b357a660557aa372ffb.tar.gz | |
Merge host.loc:/home/uchum/work/mysql-5.0
into host.loc:/home/uchum/work/5.0-opt
sql/sql_delete.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 9c82bde9497..a8238141f25 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -716,7 +716,7 @@ static table_map get_table_map(List<Item> *items) TRUE Error */ -bool mysql_multi_update_prepare(THD *thd) +int mysql_multi_update_prepare(THD *thd) { LEX *lex= thd->lex; TABLE_LIST *table_list= lex->query_tables; |