← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_stats/status_tool.cc

  • Committer: lbieber
  • Date: 2010-10-06 16:34:16 UTC
  • mfrom: (1816.1.3 build)
  • Revision ID: lbieber@orisndriz08-20101006163416-ea0sl59qgpglk21y
Merge Monty - Change the requirement from either libinnodb to libhaildb. Also, tied it to version 2.2
Merge Andrew - fix bug 650935: remove --compress from all clients
Merge Andrew - fix bug 653471: Add -A to drizzle client
Merge Travis - 621861 = To change C structs to C++ classes in Drizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/logging_stats/status_tool.cc
1
1
/*
2
 
 * Copyright (C) 2010 Joseph Daly <skinny.moey@gmail.com>
 
2
 * Copyright (c) 2010, Joseph Daly <skinny.moey@gmail.com>
3
3
 * All rights reserved.
4
4
 *
5
5
 * Redistribution and use in source and binary forms, with or without
85
85
 
86
86
  drizzle_show_var *var= NULL;
87
87
  uint32_t count= 0;
88
 
  std::vector<drizzle_show_var *>::iterator all_status_vars_iterator= all_status_vars.begin();
 
88
  vector<drizzle_show_var *>::iterator all_status_vars_iterator= all_status_vars.begin();
89
89
  while (true)
90
90
  {
91
91
    var= &StatusHelper::status_vars_defs[count];
100
100
}
101
101
 
102
102
StatusTool::Generator::Generator(Field **arg, LoggingStats *in_logging_stats,
103
 
                                 std::vector<drizzle_show_var *> *in_all_status_vars, 
 
103
                                 vector<drizzle_show_var *> *all_status_vars, 
104
104
                                 bool inIsLocal) :
105
105
  TableFunction::Generator(arg),
106
106
  logging_stats(in_logging_stats),
107
107
  isLocal(inIsLocal)   
108
108
{
109
 
  all_status_vars_it= in_all_status_vars->begin();
110
 
  all_status_vars_end= in_all_status_vars->end();
 
109
  all_status_vars_it= all_status_vars->begin();
 
110
  all_status_vars_end= all_status_vars->end();
111
111
 
112
112
  status_var_to_display= NULL;
113
113
  if (isLocal)
175
175
      drizzle_show_var tmp;
176
176
 
177
177
      for (var= variables; var->type == SHOW_FUNC; var= &tmp)
178
 
        ((drizzle_show_var_func)((st_show_var_func_container *)var->value)->func)(&tmp, buff);
 
178
        ((mysql_show_var_func)((st_show_var_func_container *)var->value)->func)(&tmp, buff);
179
179
    }
180
180
 
181
181
    if (isWild(variables->name))