← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/barrier_dictionary.cc

  • Committer: Lee Bieber
  • Date: 2010-12-15 16:23:36 UTC
  • mfrom: (1995.1.2 build)
  • Revision ID: kalebral@gmail.com-20101215162336-juntyt4gw4vgohg4
Merge Andrew - fix bug 628912: Crash / segfault in drizzled::Item_func::arguments (this=0x35) at ./drizzled/function/func.h
Merge Andrew - 663919: next query after KILL QUERY will error

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/barrier_dictionary.cc
32
32
namespace barriers {
33
33
 
34
34
UserBarriers::UserBarriers() :
35
 
  plugin::TableFunction("DATA_DICTIONARY", "USER_DEFINED_BARRIERS")
 
35
  plugin::TableFunction("DATA_DICTIONARY", "USER_BARRIERS")
36
36
{
37
37
  add_field("USER_BARRIER_NAME", plugin::TableFunction::STRING, LARGEST_LOCK_NAME, false);
38
38
  add_field("SESSION_ID", plugin::TableFunction::NUMBER, 0, false);