diff options
| author | serg@janus.mylan <> | 2007-12-20 22:11:37 +0100 |
|---|---|---|
| committer | serg@janus.mylan <> | 2007-12-20 22:11:37 +0100 |
| commit | d9ca7b670ea4fe72357fb13af2ccd6a5b25e80f3 (patch) | |
| tree | 8e1c37da4cf89e91d901badb1c2e5f100be39ec1 /sql/opt_sum.cc | |
| parent | 6accbba0c0fbe6d5154002c148ee02a475ead109 (diff) | |
| parent | d902f4d3d634fa17021ecd99cd8982cfb2352ffb (diff) | |
| download | mariadb-git-d9ca7b670ea4fe72357fb13af2ccd6a5b25e80f3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
Diffstat (limited to 'sql/opt_sum.cc')
| -rw-r--r-- | sql/opt_sum.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 1d705d716ea..42d36756845 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -175,6 +175,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) if(error) { tl->table->file->print_error(error, MYF(0)); + tl->table->in_use->fatal_error(); return error; } count*= tl->table->file->stats.records; @@ -423,6 +424,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) return HA_ERR_KEY_NOT_FOUND; // No rows matching WHERE /* HA_ERR_LOCK_DEADLOCK or some other error */ table->file->print_error(error, MYF(0)); + table->in_use->fatal_error(); return(error); } removed_tables|= table->map; |