diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2004-09-14 00:35:42 +0400 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2004-09-14 00:35:42 +0400 |
| commit | 66434a6c6a2a9d58f039370a0534604414756011 (patch) | |
| tree | 206d6a2b5a8c076b54c3626df92fde175dfe1dfe /sql | |
| parent | edb9559fd080ce1292b800eacf0d59d22fb6893e (diff) | |
| download | mariadb-git-66434a6c6a2a9d58f039370a0534604414756011.tar.gz | |
Two small fixes to make -debug version usable again.
include/my_sys.h:
Temporaly reverting Monty's optimization of clear_alloc_root() since it makes -debug server
unusable.
sql/sql_select.cc:
After merge fix. Now deletion is done outside of handle_select().
(We fixed the same issue with deletion of LEX::result in 4.1 for prepared statements
but in more general way).
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index ca81e30bb8e..cd2eb7c1516 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -232,8 +232,6 @@ int handle_select(THD *thd, LEX *lex, select_result *result) result->abort(); res= 1; // Error sent to client } - if (result != lex->result) - delete result; DBUG_RETURN(res); } |