← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_stats/stats_schema.cc

Merge Monty - Updates to pandora-build to support features of gcc 4.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/logging_stats/stats_schema.cc
52
52
 * +----------------+---------+-------+---------+-----------------+-----------+
53
53
 * | Field          | Type    | Null  | Default | Default_is_NULL | On_Update |
54
54
 * +----------------+---------+-------+---------+-----------------+-----------+
55
 
 * | USERNAME       | VARCHAR | FALSE |         | FALSE           |           |
 
55
 * | USER           | VARCHAR | FALSE |         | FALSE           |           |
56
56
 * | IP             | VARCHAR | FALSE |         | FALSE           |           |
57
57
 * | COUNT_SELECT   | BIGINT  | FALSE |         | FALSE           |           |
58
58
 * | COUNT_DELETE   | BIGINT  | FALSE |         | FALSE           |           |
70
70
 * +----------------+---------+-------+---------+-----------------+-----------+
71
71
 * | Field          | Type    | Null  | Default | Default_is_NULL | On_Update |
72
72
 * +----------------+---------+-------+---------+-----------------+-----------+
73
 
 * | USERNAME       | VARCHAR | FALSE |         | FALSE           |           |
 
73
 * | USER           | VARCHAR | FALSE |         | FALSE           |           |
74
74
 * | COUNT_SELECT   | BIGINT  | FALSE |         | FALSE           |           |
75
75
 * | COUNT_DELETE   | BIGINT  | FALSE |         | FALSE           |           |
76
76
 * | COUNT_UPDATE   | BIGINT  | FALSE |         | FALSE           |           |
87
87
 * +---------------------+---------+-------+---------+-----------------+-----------+
88
88
 * | Field               | Type    | Null  | Default | Default_is_NULL | On_Update |
89
89
 * +---------------------+---------+-------+---------+-----------------+-----------+
90
 
 * | USERNAME            | VARCHAR | FALSE |         | FALSE           |           | 
 
90
 * | USER                | VARCHAR | FALSE |         | FALSE           |           | 
91
91
 * | BYTES_RECEIVED      | VARCHAR | FALSE |         | FALSE           |           | 
92
92
 * | BYTES_SENT          | VARCHAR | FALSE |         | FALSE           |           | 
93
93
 * | DENIED_CONNECTIONS  | VARCHAR | FALSE |         | FALSE           |           | 
103
103
 *
104
104
 */
105
105
 
106
 
#include <config.h>
107
 
#include <drizzled/statistics_variables.h>
 
106
#include "config.h"
 
107
 
108
108
#include "stats_schema.h"
 
109
 
109
110
#include <sstream>
110
111
 
111
112
using namespace drizzled;
133
134
  std::vector<ScoreboardSlot* > *scoreboard_vector=
134
135
     current_scoreboard->getVectorOfScoreboardVectors()->at(bucket_number);
135
136
 
 
137
  std::vector<ScoreboardSlot *>::iterator scoreboard_vector_it= scoreboard_vector->begin();
 
138
  std::vector<ScoreboardSlot *>::iterator scoreboard_vector_end= scoreboard_vector->end();
 
139
 
136
140
  ScoreboardSlot *scoreboard_slot= NULL;
137
141
  for (std::vector<ScoreboardSlot *>::iterator it= scoreboard_vector->begin();
138
142
       it != scoreboard_vector->end(); ++it)
222
226
{
223
227
  outer_logging_stats= logging_stats;
224
228
 
225
 
  add_field("USERNAME");
 
229
  add_field("USER");
226
230
  add_field("IP");
227
231
 
228
232
  uint32_t number_commands= UserCommands::getUserCounts();
314
318
{
315
319
  outer_logging_stats= logging_stats;
316
320
 
317
 
  add_field("USERNAME");
 
321
  add_field("USER");
318
322
 
319
323
  uint32_t number_commands= UserCommands::getUserCounts();
320
324
 
380
384
{
381
385
  outer_logging_stats= logging_stats;
382
386
 
383
 
  add_field("USERNAME");
 
387
  add_field("USER");
384
388
  add_field("BYTES_RECEIVED");
385
389
  add_field("BYTES_SENT");
386
390
  add_field("DENIED_CONNECTIONS");