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

« back to all changes in this revision

Viewing changes to storage/perfschema/pfs_account.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:
1
 
/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 
1
/* Copyright (c) 2010, 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
527
527
                    account->m_key.m_key_length));
528
528
  if (entry && (entry != MY_ERRPTR))
529
529
  {
530
 
    PFS_account *pfs;
531
 
    pfs= *entry;
532
 
    DBUG_ASSERT(pfs == account);
 
530
    DBUG_ASSERT(*entry == account);
533
531
    if (account->get_refcount() == 0)
534
532
    {
535
533
      lf_hash_delete(&account_hash, pins,