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

Proposed by Brian Aker on 2011-05-23
Status: Merged
Approved by: Brian Aker on 2011-05-23
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 2011-05-23 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
1=== modified file 'plugin/schema_dictionary/tests/r/data_dictionary.result'
2--- plugin/schema_dictionary/tests/r/data_dictionary.result 2011-04-29 18:45:16 +0000
3+++ plugin/schema_dictionary/tests/r/data_dictionary.result 2011-05-23 22:43:26 +0000
4@@ -425,7 +425,6 @@
5 SCOREBOARD_SIZE
6 SEGID
7 SEQUENCE_IN_INDEX
8-SESION_USERNAME
9 SESSION_CATALOG
10 SESSION_HOST
11 SESSION_ID
12@@ -433,6 +432,7 @@
13 SESSION_ID
14 SESSION_ID
15 SESSION_SCHEMA
16+SESSION_USERNAME
17 SORTLEN
18 SPACE
19 SPACE
20@@ -989,11 +989,11 @@
21 DATA_DICTIONARY SESSIONS IS_CONSOLE
22 DATA_DICTIONARY SESSIONS IS_INTERACTIVE
23 DATA_DICTIONARY SESSIONS QUERY
24-DATA_DICTIONARY SESSIONS SESION_USERNAME
25 DATA_DICTIONARY SESSIONS SESSION_CATALOG
26 DATA_DICTIONARY SESSIONS SESSION_HOST
27 DATA_DICTIONARY SESSIONS SESSION_ID
28 DATA_DICTIONARY SESSIONS SESSION_SCHEMA
29+DATA_DICTIONARY SESSIONS SESSION_USERNAME
30 DATA_DICTIONARY SESSIONS STATE
31 DATA_DICTIONARY SESSION_STATEMENTS VARIABLE_NAME
32 DATA_DICTIONARY SESSION_STATEMENTS VARIABLE_VALUE
33@@ -1787,11 +1787,11 @@
34 SESSIONS DATA_DICTIONARY IS_CONSOLE
35 SESSIONS DATA_DICTIONARY IS_INTERACTIVE
36 SESSIONS DATA_DICTIONARY QUERY
37-SESSIONS DATA_DICTIONARY SESION_USERNAME
38 SESSIONS DATA_DICTIONARY SESSION_CATALOG
39 SESSIONS DATA_DICTIONARY SESSION_HOST
40 SESSIONS DATA_DICTIONARY SESSION_ID
41 SESSIONS DATA_DICTIONARY SESSION_SCHEMA
42+SESSIONS DATA_DICTIONARY SESSION_USERNAME
43 SESSIONS DATA_DICTIONARY STATE
44 SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_NAME
45 SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_VALUE
46@@ -2376,11 +2376,11 @@
47 SESSIONS DATA_DICTIONARY IS_CONSOLE
48 SESSIONS DATA_DICTIONARY IS_INTERACTIVE
49 SESSIONS DATA_DICTIONARY QUERY
50-SESSIONS DATA_DICTIONARY SESION_USERNAME
51 SESSIONS DATA_DICTIONARY SESSION_CATALOG
52 SESSIONS DATA_DICTIONARY SESSION_HOST
53 SESSIONS DATA_DICTIONARY SESSION_ID
54 SESSIONS DATA_DICTIONARY SESSION_SCHEMA
55+SESSIONS DATA_DICTIONARY SESSION_USERNAME
56 SESSIONS DATA_DICTIONARY STATE
57 SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_NAME
58 SESSION_STATEMENTS DATA_DICTIONARY VARIABLE_VALUE
59
60=== modified file 'plugin/session_dictionary/sessions.cc'
61--- plugin/session_dictionary/sessions.cc 2011-04-08 14:46:29 +0000
62+++ plugin/session_dictionary/sessions.cc 2011-05-23 22:43:26 +0000
63@@ -42,7 +42,7 @@
64 plugin::TableFunction("DATA_DICTIONARY", "SESSIONS")
65 {
66 add_field("SESSION_ID", plugin::TableFunction::NUMBER, 0, false);
67- add_field("SESION_USERNAME", 16);
68+ add_field("SESSION_USERNAME", 16);
69 add_field("SESSION_HOST", NI_MAXHOST);
70 add_field("SESSION_CATALOG", plugin::TableFunction::STRING, MAXIMUM_IDENTIFIER_LENGTH, false);
71 add_field("SESSION_SCHEMA", plugin::TableFunction::STRING, MAXIMUM_IDENTIFIER_LENGTH, true);