~drizzle-trunk/drizzle/development

Viewing changes to plugin/session_dictionary/tests/r/data_dictionary.result

Committer: lbieber
Date: 2010-09-09 14:04:37 UTC
mfrom: (1726.3.10 drizzle-bug-621603)
mto: This revision was merged to the branch mainline in revision 1751.
Revision ID: lbieber@orisndriz03-20100909140437-5l2robypz8w1g7tj

Merge Andrew - fix bug 621603: Connections status variable off by one
Merge Andrew - fix bug 621947: show processlist filldown
Merge Andrew - fix bug 628284: --mysql option broken

files added:
plugin/drizzle_protocol/table_function.h

plugin/mysql_protocol/table_function.h

files modified:
drizzled/session.cc

drizzled/statistics_variables.h

drizzled/status_helper.cc

plugin/drizzle_protocol/drizzle_protocol.cc

plugin/drizzle_protocol/drizzle_protocol.h

plugin/drizzle_protocol/plugin.ini

plugin/information_schema_dictionary/tests/r/tables.result

plugin/mysql_protocol/mysql_protocol.cc

plugin/mysql_protocol/mysql_protocol.h

plugin/mysql_protocol/plugin.ini

plugin/schema_dictionary/tests/r/data_dictionary.result

plugin/session_dictionary/processlist.cc

plugin/session_dictionary/tests/r/data_dictionary.result

tests/r/create.result

tests/r/data_dictionary_like_info.result

tests/r/information_schema.result

Show diffs side-by-side

added added

removed removed

plugin/session_dictionary/tests/r/data_dictionary.result

`DB` VARCHAR(256) NOT NULL,

`COMMAND` VARCHAR(16) NOT NULL,

`TIME` BIGINT NOT NULL,

`STATE` VARCHAR(256) NOT NULL,

`INFO` VARCHAR(100) NOT NULL

`STATE` VARCHAR(256) DEFAULT NULL,

`INFO` VARCHAR(100) DEFAULT NULL

) ENGINE=FunctionEngine COLLATE = utf8_general_ci

SELECT ID FROM processlist;

Older »