diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-24 00:41:18 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-24 00:41:18 +0400 |
| commit | b69a31fad5e41494c3c696f369d0c4ce48de45e3 (patch) | |
| tree | f4f37b22f4271c44aa03c55abe609a058828bedc /dbug | |
| parent | eff442964a68d63a0ce9fe3e89332e5cc2b623e4 (diff) | |
| parent | 6e34b8b0ce0bd52cdc36182baeb3f313012d694b (diff) | |
| download | mariadb-git-b69a31fad5e41494c3c696f369d0c4ce48de45e3.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
conflict Makefile.am
conflict mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
conflict mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
conflict sql/opt_sum.cc
conflict sql/set_var.cc
conflict sql/sql_base.cc
conflict sql/sql_priv.h
conflict sql/sql_show.cc
Diffstat (limited to 'dbug')
| -rw-r--r-- | dbug/dbug.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index 15d31e0c370..ff7efb4ff55 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -1715,10 +1715,7 @@ void _db_end_() while ((discard= cs->stack)) { if (discard == &init_settings) - { - FreeState (cs, discard, 0); break; - } cs->stack= discard->next; FreeState(cs, discard, 1); } |