diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 00:54:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 00:54:03 +0100 |
| commit | 59d9d08e2b6f6f35e781d24c47d33d26fb4ba2a5 (patch) | |
| tree | 3e4a302ccf3912d4d8a40aa271414003bfe7c9b6 /sql/records.cc | |
| parent | ce02738d7f2f2688eeec7004dd6a30293d36044f (diff) | |
| parent | 6b6d40fa6ca1fe36f2a51c2723c58dfb3fc025bb (diff) | |
| download | mariadb-git-59d9d08e2b6f6f35e781d24c47d33d26fb4ba2a5.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/records.cc')
| -rw-r--r-- | sql/records.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/records.cc b/sql/records.cc index e534c04935a..1b230c41156 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -189,7 +189,8 @@ bool init_read_record(READ_RECORD *info,THD *thd, TABLE *table, info->table=table; info->forms= &info->table; /* Only one table */ - if (table->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE && + if ((table->s->tmp_table == INTERNAL_TMP_TABLE || + table->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE) && !table->sort.addon_field) (void) table->file->extra(HA_EXTRA_MMAP); |