← Back to branch summary

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

« back to all changes in this revision

Viewing changes to storage/perfschema/pfs_user.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:
storage/perfschema/pfs_user.cc
1
 
/* Copyright (c) 2010, 2012, 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
346
346
                    user->m_key.m_hash_key, user->m_key.m_key_length));
347
347
  if (entry && (entry != MY_ERRPTR))
348
348
  {
349
 
    PFS_user *pfs;
350
 
    pfs= *entry;
351
 
    DBUG_ASSERT(pfs == user);
 
349
    DBUG_ASSERT(*entry == user);
352
350
    if (user->get_refcount() == 0)
353
351
    {
354
352
      lf_hash_delete(&user_hash, pins,