diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
commit | 9af177042ed0e297b8f26f2c2f8ae00b3a814a90 (patch) | |
tree | 0d8d2fab7ebeb02f3c25c00ac1543754b625bde8 /dbug | |
parent | a6add4ff43a905cee1bfd00b2ec2d276018866ce (diff) | |
parent | 2fe0836eed16ce5809c34064893681f12c77da9f (diff) | |
download | mariadb-git-9af177042ed0e297b8f26f2c2f8ae00b3a814a90.tar.gz |
10.0-base merge.
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
Diffstat (limited to 'dbug')
-rw-r--r-- | dbug/dbug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index 9ec8044eaf1..c6d95a74c1c 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -1642,6 +1642,7 @@ void _db_end_() cs->stack= &init_settings; FreeState(cs, 0); + init_done= 0; } |