mysql-5.5.33 merge

This commit is contained in:
Sergei Golubchik 2013-09-06 22:31:30 +02:00
commit b838d081ad
315 changed files with 2011 additions and 1281 deletions

View file

@ -1,4 +1,4 @@
/* Copyright (c) 2009, 2010, 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
@ -1397,7 +1397,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;