Merge lp:~linuxjedi/drizzle/trunk-bug-743902 into lp:~drizzle-trunk/drizzle/development

Proposed by Andrew Hutchings on 2011-06-13
Status: Merged
Approved by: Brian Aker on 2011-06-13
Approved revision: 2292
Merged at revision: 2332
Proposed branch: lp:~linuxjedi/drizzle/trunk-bug-743902
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 95 lines (+2/-15)
4 files modified
drizzled/plugin/client.h (+0/-5)
plugin/schema_dictionary/tests/r/data_dictionary.result (+1/-5)
plugin/session_dictionary/sessions.cc (+0/-4)
tests/valgrind.supp (+1/-1)
To merge this branch: bzr merge lp:~linuxjedi/drizzle/trunk-bug-743902
Reviewer Review Type Date Requested Status
Drizzle Merge Team 2011-06-13 Pending
Review via email: mp+64426@code.launchpad.net

Description of the change

Fix valgrind suppression
Remove some stuff missed off (Olaf's lp:~olafvdspek/drizzle/refactor5 also attempts this but misses a few bits and fails a test)

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 'drizzled/plugin/client.h'
2--- drizzled/plugin/client.h 2011-06-03 17:57:03 +0000
3+++ drizzled/plugin/client.h 2011-06-13 17:52:29 +0000
4@@ -111,11 +111,6 @@
5 return false;
6 }
7
8- virtual bool isAdmin() const
9- {
10- return false;
11- }
12-
13 virtual catalog::Instance::shared_ptr catalog()
14 {
15 return catalog::local();
16
17=== modified file 'plugin/schema_dictionary/tests/r/data_dictionary.result'
18--- plugin/schema_dictionary/tests/r/data_dictionary.result 2011-05-23 22:30:39 +0000
19+++ plugin/schema_dictionary/tests/r/data_dictionary.result 2011-06-13 17:52:29 +0000
20@@ -1,7 +1,7 @@
21 use data_dictionary;
22 SELECT count(*) FROM columns;
23 count(*)
24-586
25+585
26 SELECT count(*) FROM indexes;
27 count(*)
28 2
29@@ -251,7 +251,6 @@
30 INTERVAL_TYPE
31 IP
32 IS_ACTIVE
33-IS_ADMIN
34 IS_AUTO_INCREMENT
35 IS_BUILTIN
36 IS_COMPILED
37@@ -985,7 +984,6 @@
38 DATA_DICTIONARY SCOREBOARD_STATISTICS SCOREBOARD_SIZE
39 DATA_DICTIONARY SESSIONS COMMAND
40 DATA_DICTIONARY SESSIONS HAS_GLOBAL_LOCK
41-DATA_DICTIONARY SESSIONS IS_ADMIN
42 DATA_DICTIONARY SESSIONS IS_CONSOLE
43 DATA_DICTIONARY SESSIONS IS_INTERACTIVE
44 DATA_DICTIONARY SESSIONS QUERY
45@@ -1783,7 +1781,6 @@
46 SCOREBOARD_STATISTICS DATA_DICTIONARY SCOREBOARD_SIZE
47 SESSIONS DATA_DICTIONARY COMMAND
48 SESSIONS DATA_DICTIONARY HAS_GLOBAL_LOCK
49-SESSIONS DATA_DICTIONARY IS_ADMIN
50 SESSIONS DATA_DICTIONARY IS_CONSOLE
51 SESSIONS DATA_DICTIONARY IS_INTERACTIVE
52 SESSIONS DATA_DICTIONARY QUERY
53@@ -2372,7 +2369,6 @@
54 SCOREBOARD_STATISTICS DATA_DICTIONARY SCOREBOARD_SIZE
55 SESSIONS DATA_DICTIONARY COMMAND
56 SESSIONS DATA_DICTIONARY HAS_GLOBAL_LOCK
57-SESSIONS DATA_DICTIONARY IS_ADMIN
58 SESSIONS DATA_DICTIONARY IS_CONSOLE
59 SESSIONS DATA_DICTIONARY IS_INTERACTIVE
60 SESSIONS DATA_DICTIONARY QUERY
61
62=== modified file 'plugin/session_dictionary/sessions.cc'
63--- plugin/session_dictionary/sessions.cc 2011-05-23 22:30:39 +0000
64+++ plugin/session_dictionary/sessions.cc 2011-06-13 17:52:29 +0000
65@@ -51,7 +51,6 @@
66 add_field("QUERY", plugin::TableFunction::STRING, PROCESS_LIST_WIDTH, true);
67 add_field("HAS_GLOBAL_LOCK", plugin::TableFunction::BOOLEAN, 0, false);
68 add_field("IS_INTERACTIVE", plugin::TableFunction::BOOLEAN, 0, false);
69- add_field("IS_ADMIN", plugin::TableFunction::BOOLEAN, 0, false);
70 add_field("IS_CONSOLE", plugin::TableFunction::BOOLEAN, 0, false);
71 }
72
73@@ -131,9 +130,6 @@
74 /* IS_INTERACTIVE */
75 push(tmp->getClient()->isInteractive());
76
77- /* IS_ADMIN */
78- push(tmp->getClient()->isAdmin());
79-
80 /* IS_CONSOLE */
81 push(tmp->getClient()->isConsole());
82
83
84=== modified file 'tests/valgrind.supp'
85--- tests/valgrind.supp 2011-06-09 13:26:35 +0000
86+++ tests/valgrind.supp 2011-06-13 17:52:29 +0000
87@@ -48,7 +48,7 @@
88
89 {
90 glibc nss issue
91- Memcheck:Cond
92+ Memcheck:Leak
93 ...
94 fun:__nss_database_lookup
95 ...