← Back to branch summary

~ubuntu-branches/ubuntu/wily/mysql-5.6/wily

« back to all changes in this revision

Viewing changes to sql/mdl.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-04-16 20:07:10 UTC
  • mto: (1.3.9 vivid-proposed)
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: package-import@ubuntu.com-20150416200710-pcrsa022082zj46k
Tags: upstream-5.6.24
Import upstream version 5.6.24

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/mdl.cc
1
 
/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 
1
/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
2
2
 
3
3
   This program is free software; you can redistribute it and/or modify
4
4
   it under the terms of the GNU General Public License as published by
1930
1930
bool
1931
1931
MDL_context::try_acquire_lock(MDL_request *mdl_request)
1932
1932
{
1933
 
  MDL_ticket *ticket;
 
1933
  MDL_ticket *ticket= NULL;
1934
1934
 
1935
1935
  if (try_acquire_lock_impl(mdl_request, &ticket))
1936
1936
    return TRUE;
2184
2184
MDL_context::acquire_lock(MDL_request *mdl_request, ulong lock_wait_timeout)
2185
2185
{
2186
2186
  MDL_lock *lock;
2187
 
  MDL_ticket *ticket;
 
2187
  MDL_ticket *ticket= NULL;
2188
2188
  struct timespec abs_timeout;
2189
2189
  MDL_wait::enum_wait_status wait_status;
2190
2190
  /* Do some work outside the critical section. */