← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/select_dumpvar.cc

  • Committer: Lee Bieber
  • Date: 2011-02-24 03:20:47 UTC
  • mfrom: (2196.1.4 build)
  • Revision ID: kalebral@gmail.com-20110224032047-avmw06iwww3m73cw
Merge Andrew - 723653: Docs day first pass fixes 
Merge Brian - Puts back in support for COM_KILL, Also adds back in the INTERACTIVE flag, and creates a DD to track sessions/check on usage
Merge Olaf - Use List::size()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/select_dumpvar.cc
76
76
{
77
77
  unit= u;
78
78
 
79
 
  if (var_list.size() != list.elements)
 
79
  if (var_list.size() != list.size())
80
80
  {
81
81
    my_message(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT,
82
82
               ER(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT), MYF(0));