summaryrefslogtreecommitdiff
path: root/sql/sql_lifo_buffer.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-02-22 22:51:20 +0100
committerSergei Golubchik <sergii@pisem.net>2014-02-22 22:51:20 +0100
commitff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e (patch)
tree63150adc067c1bb6cb476eef00094083e1a53865 /sql/sql_lifo_buffer.h
parent004642525d8c4ed02686719395faf477e94cd618 (diff)
parent3e03c9eae9089cd2cae0f378bd81ff29367f41eb (diff)
downloadmariadb-git-ff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e.tar.gz
5.3 merge
Diffstat (limited to 'sql/sql_lifo_buffer.h')
-rw-r--r--sql/sql_lifo_buffer.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lifo_buffer.h b/sql/sql_lifo_buffer.h
index 5b7ddf35474..feec4aeb4c2 100644
--- a/sql/sql_lifo_buffer.h
+++ b/sql/sql_lifo_buffer.h
@@ -83,7 +83,8 @@ public:
{
start= start_arg;
end= end_arg;
- TRASH(start, end - start);
+ if (end != start)
+ TRASH(start, end - start);
reset();
}