Drizzle

Merge lp:~brianaker/drizzle/bug786515-trunk into lp:~drizzle-trunk/drizzle/development

  1. bug786515-trunk
  2. Merge into development
Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: 2313
Merged at revision: 2315
Proposed branch: lp:~brianaker/drizzle/bug786515-trunk
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 71 lines (+5/-5)
2 files modified
plugin/schema_dictionary/tests/r/data_dictionary.result (+4/-4)
plugin/session_dictionary/sessions.cc (+1/-1)
To merge this branch: bzr merge lp:~brianaker/drizzle/bug786515-trunk
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+62048@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugin/schema_dictionary/tests/r/data_dictionary.result'
--- plugin/schema_dictionary/tests/r/data_dictionary.result 2011-04-29 18:45:16 +0000
+++ plugin/schema_dictionary/tests/r/data_dictionary.result 2011-05-23 22:43:26 +0000
@@ -425,7 +425,6 @@
425SCOREBOARD_SIZE425SCOREBOARD_SIZE
426SEGID426SEGID
427SEQUENCE_IN_INDEX427SEQUENCE_IN_INDEX
428SESION_USERNAME
429SESSION_CATALOG428SESSION_CATALOG
430SESSION_HOST429SESSION_HOST
431SESSION_ID430SESSION_ID
@@ -433,6 +432,7 @@
433SESSION_ID432SESSION_ID
434SESSION_ID433SESSION_ID
435SESSION_SCHEMA434SESSION_SCHEMA
435SESSION_USERNAME
436SORTLEN436SORTLEN
437SPACE437SPACE
438SPACE438SPACE
@@ -989,11 +989,11 @@
989DATA_DICTIONARY SESSIONS IS_CONSOLE989DATA_DICTIONARY SESSIONS IS_CONSOLE
990DATA_DICTIONARY SESSIONS IS_INTERACTIVE990DATA_DICTIONARY SESSIONS IS_INTERACTIVE
991DATA_DICTIONARY SESSIONS QUERY991DATA_DICTIONARY SESSIONS QUERY
992DATA_DICTIONARY SESSIONS SESION_USERNAME
993DATA_DICTIONARY SESSIONS SESSION_CATALOG992DATA_DICTIONARY SESSIONS SESSION_CATALOG
994DATA_DICTIONARY SESSIONS SESSION_HOST993DATA_DICTIONARY SESSIONS SESSION_HOST
995DATA_DICTIONARY SESSIONS SESSION_ID994DATA_DICTIONARY SESSIONS SESSION_ID
996DATA_DICTIONARY SESSIONS SESSION_SCHEMA995DATA_DICTIONARY SESSIONS SESSION_SCHEMA
996DATA_DICTIONARY SESSIONS SESSION_USERNAME
997DATA_DICTIONARY SESSIONS STATE997DATA_DICTIONARY SESSIONS STATE
998DATA_DICTIONARY SESSION_STATEMENTS VARIABLE_NAME998DATA_DICTIONARY SESSION_STATEMENTS VARIABLE_NAME
999DATA_DICTIONARY SESSION_STATEMENTS VARIABLE_VALUE999DATA_DICTIONARY SESSION_STATEMENTS VARIABLE_VALUE
@@ -1787,11 +1787,11 @@
1787SESSIONS DATA_DICTIONARY IS_CONSOLE1787SESSIONS DATA_DICTIONARY IS_CONSOLE
1788SESSIONS DATA_DICTIONARY IS_INTERACTIVE1788SESSIONS DATA_DICTIONARY IS_INTERACTIVE
1789SESSIONS DATA_DICTIONARY QUERY1789SESSIONS DATA_DICTIONARY QUERY
1790SESSIONS DATA_DICTIONARY SESION_USERNAME
1791SESSIONS DATA_DICTIONARY SESSION_CATALOG1790SESSIONS DATA_DICTIONARY SESSION_CATALOG
1792SESSIONS DATA_DICTIONARY SESSION_HOST1791SESSIONS DATA_DICTIONARY SESSION_HOST
1793SESSIONS DATA_DICTIONARY SESSION_ID1792SESSIONS DATA_DICTIONARY SESSION_ID
1794SESSIONS DATA_DICTIONARY SESSION_SCHEMA1793SESSIONS DATA_DICTIONARY SESSION_SCHEMA
1794SESSIONS DATA_DICTIONARY SESSION_USERNAME
1795SESSIONS DATA_DICTIONARY STATE1795SESSIONS DATA_DICTIONARY STATE
1796SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_NAME1796SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_NAME
1797SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_VALUE1797SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_VALUE
@@ -2376,11 +2376,11 @@
2376SESSIONS DATA_DICTIONARY IS_CONSOLE2376SESSIONS DATA_DICTIONARY IS_CONSOLE
2377SESSIONS DATA_DICTIONARY IS_INTERACTIVE2377SESSIONS DATA_DICTIONARY IS_INTERACTIVE
2378SESSIONS DATA_DICTIONARY QUERY2378SESSIONS DATA_DICTIONARY QUERY
2379SESSIONS DATA_DICTIONARY SESION_USERNAME
2380SESSIONS DATA_DICTIONARY SESSION_CATALOG2379SESSIONS DATA_DICTIONARY SESSION_CATALOG
2381SESSIONS DATA_DICTIONARY SESSION_HOST2380SESSIONS DATA_DICTIONARY SESSION_HOST
2382SESSIONS DATA_DICTIONARY SESSION_ID2381SESSIONS DATA_DICTIONARY SESSION_ID
2383SESSIONS DATA_DICTIONARY SESSION_SCHEMA2382SESSIONS DATA_DICTIONARY SESSION_SCHEMA
2383SESSIONS DATA_DICTIONARY SESSION_USERNAME
2384SESSIONS DATA_DICTIONARY STATE2384SESSIONS DATA_DICTIONARY STATE
2385SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_NAME2385SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_NAME
2386SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_VALUE2386SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_VALUE
23872387
=== modified file 'plugin/session_dictionary/sessions.cc'
--- plugin/session_dictionary/sessions.cc 2011-04-08 14:46:29 +0000
+++ plugin/session_dictionary/sessions.cc 2011-05-23 22:43:26 +0000
@@ -42,7 +42,7 @@
42 plugin::TableFunction("DATA_DICTIONARY", "SESSIONS")42 plugin::TableFunction("DATA_DICTIONARY", "SESSIONS")
43{43{
44 add_field("SESSION_ID", plugin::TableFunction::NUMBER, 0, false);44 add_field("SESSION_ID", plugin::TableFunction::NUMBER, 0, false);
45 add_field("SESION_USERNAME", 16);45 add_field("SESSION_USERNAME", 16);
46 add_field("SESSION_HOST", NI_MAXHOST);46 add_field("SESSION_HOST", NI_MAXHOST);
47 add_field("SESSION_CATALOG", plugin::TableFunction::STRING, MAXIMUM_IDENTIFIER_LENGTH, false);47 add_field("SESSION_CATALOG", plugin::TableFunction::STRING, MAXIMUM_IDENTIFIER_LENGTH, false);
48 add_field("SESSION_SCHEMA", plugin::TableFunction::STRING, MAXIMUM_IDENTIFIER_LENGTH, true);48 add_field("SESSION_SCHEMA", plugin::TableFunction::STRING, MAXIMUM_IDENTIFIER_LENGTH, true);