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 /sql/debug_sync.cc | |
| 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 'sql/debug_sync.cc')
| -rw-r--r-- | sql/debug_sync.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc index 750f770552e..35b838d7c3d 100644 --- a/sql/debug_sync.cc +++ b/sql/debug_sync.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. +/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1394,7 +1394,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action) if (action->wait_for.length()) { mysql_mutex_t *old_mutex; - mysql_cond_t *UNINIT_VAR(old_cond); + mysql_cond_t *old_cond= NULL; int error= 0; struct timespec abstime; |