← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/utility_functions/kill.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 04:19:44 UTC
  • mto: (2192.1.1 drizzle-staging)
  • mto: This revision was merged to the branch mainline in revision 2193.
  • Revision ID: brian@tangent.org-20110222041944-furz1h252ecz7mpd
Merge in modifications such that we check both schema and table for
replication option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/utility_functions/kill.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
 
21
#include <config.h>
22
22
 
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/session/cache.h>
25
 
#include "plugin/utility_functions/functions.h"
 
25
#include <plugin/utility_functions/functions.h>
26
26
 
27
27
namespace drizzled
28
28
{
48
48
    return 0;
49
49
  }
50
50
 
51
 
  if (not die_session->isViewable())
 
51
  if (not die_session->isViewable(*getSession().user()))
52
52
  {
53
53
    my_error(drizzled::ER_KILL_DENIED_ERROR, session_id_for_kill, MYF(0));
54
54
    return 0;