← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_stats/user_commands.h

Committer: Brian Aker
Date: 2010-05-05 06:11:15 UTC
mfrom: (1491.4.26 scoreboard_internal_not_enabled)
Revision ID: brian@gaz-20100505061115-qd2i0yl4rqlx3oz0

Merge joe.

files modified:
drizzled/drizzled.cc

drizzled/session.h

drizzled/show.cc

drizzled/show.h

drizzled/sql_parse.cc

plugin/logging_stats/logging_stats.cc

plugin/logging_stats/logging_stats.h

plugin/logging_stats/scoreboard.cc

plugin/logging_stats/scoreboard.h

plugin/logging_stats/stats_schema.cc

plugin/logging_stats/tests/r/command.result

plugin/logging_stats/tests/r/max_user.result

plugin/logging_stats/tests/t/command.test

plugin/logging_stats/tests/t/max_user.test

plugin/logging_stats/user_commands.cc

plugin/logging_stats/user_commands.h

plugin/schema_dictionary/tests/r/data_dictionary.result

plugin/status_dictionary/dictionary.cc

plugin/status_dictionary/status.h

plugin/status_dictionary/tests/r/data_dictionary.result

plugin/status_dictionary/tests/t/data_dictionary.test

tests/r/data_dictionary_like_info.result

tests/r/information_schema.result

Show diffs side-by-side

added added

removed removed

plugin/logging_stats/user_commands.h

62

62

return COUNT_END;

63

63

}

64

64

65

static const char *STATUS_VARS[];

65

static const char *COM_STATUS_VARS[];

66

66

67

67

static const char *USER_COUNTS[];

68

68

Older »