diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-07-24 16:13:31 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-07-24 16:13:31 +0400 |
| commit | ec7ea4454102db998c5477624f576308e52d9f3d (patch) | |
| tree | 86d97959512d0881cffc9495bb90089bbbc21b54 /sql | |
| parent | f20dd8642509d9c74f4fec1c16e05dcf1959d706 (diff) | |
| parent | c76f98a5f018ec0d9d24517a6c7f6c541597e857 (diff) | |
| download | mariadb-git-ec7ea4454102db998c5477624f576308e52d9f3d.tar.gz | |
Automerge.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 60f4880fe70..0a5706ee989 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -10286,6 +10286,11 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param, if (table->s->db_type != DB_TYPE_HEAP || error != HA_ERR_RECORD_FILE_FULL) { + /* + We don't want this error to be converted to a warning, e.g. in case of + INSERT IGNORE ... SELECT. + */ + thd->is_fatal_error= 1; table->file->print_error(error,MYF(0)); DBUG_RETURN(1); } |