diff options
| author | monty@mysql.com <> | 2004-02-09 12:31:03 +0100 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-09 12:31:03 +0100 |
| commit | 06432eac3606d75045109e3bad2538543f1a574b (patch) | |
| tree | 4cdb6965fba280ace2fc30421a0f25332597e43e /sql/sql_update.cc | |
| parent | 480b082cf44db4fb2722e256f16e5f8c7c537bcf (diff) | |
| download | mariadb-git-06432eac3606d75045109e3bad2538543f1a574b.tar.gz | |
Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index c6e470fd09f..86593f5ea20 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -482,8 +482,11 @@ int mysql_multi_update(THD *thd, for (tl= select_lex->get_table_list() ; tl ; tl= tl->next) { if (tl->derived && (item_tables & tl->table->map)) + { my_printf_error(ER_NON_UPDATABLE_TABLE, ER(ER_NON_UPDATABLE_TABLE), MYF(0), tl->alias, "UPDATE"); + DBUG_RETURN(-1); + } } } |