Drizzle

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

  1. trunk-bug-743902
  2. Merge into development
Proposed by Andrew Hutchings
Status: Merged
Approved by: Brian Aker
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 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
=== modified file 'drizzled/plugin/client.h'
--- drizzled/plugin/client.h 2011-06-03 17:57:03 +0000
+++ drizzled/plugin/client.h 2011-06-13 17:52:29 +0000
@@ -111,11 +111,6 @@
111 return false;111 return false;
112 }112 }
113113
114 virtual bool isAdmin() const
115 {
116 return false;
117 }
118
119 virtual catalog::Instance::shared_ptr catalog()114 virtual catalog::Instance::shared_ptr catalog()
120 {115 {
121 return catalog::local();116 return catalog::local();
122117
=== modified file 'plugin/schema_dictionary/tests/r/data_dictionary.result'
--- plugin/schema_dictionary/tests/r/data_dictionary.result 2011-05-23 22:30:39 +0000
+++ plugin/schema_dictionary/tests/r/data_dictionary.result 2011-06-13 17:52:29 +0000
@@ -1,7 +1,7 @@
1use data_dictionary;1use data_dictionary;
2SELECT count(*) FROM columns;2SELECT count(*) FROM columns;
3count(*)3count(*)
45864585
5SELECT count(*) FROM indexes;5SELECT count(*) FROM indexes;
6count(*)6count(*)
7272
@@ -251,7 +251,6 @@
251INTERVAL_TYPE251INTERVAL_TYPE
252IP252IP
253IS_ACTIVE253IS_ACTIVE
254IS_ADMIN
255IS_AUTO_INCREMENT254IS_AUTO_INCREMENT
256IS_BUILTIN255IS_BUILTIN
257IS_COMPILED256IS_COMPILED
@@ -985,7 +984,6 @@
985DATA_DICTIONARY SCOREBOARD_STATISTICS SCOREBOARD_SIZE984DATA_DICTIONARY SCOREBOARD_STATISTICS SCOREBOARD_SIZE
986DATA_DICTIONARY SESSIONS COMMAND985DATA_DICTIONARY SESSIONS COMMAND
987DATA_DICTIONARY SESSIONS HAS_GLOBAL_LOCK986DATA_DICTIONARY SESSIONS HAS_GLOBAL_LOCK
988DATA_DICTIONARY SESSIONS IS_ADMIN
989DATA_DICTIONARY SESSIONS IS_CONSOLE987DATA_DICTIONARY SESSIONS IS_CONSOLE
990DATA_DICTIONARY SESSIONS IS_INTERACTIVE988DATA_DICTIONARY SESSIONS IS_INTERACTIVE
991DATA_DICTIONARY SESSIONS QUERY989DATA_DICTIONARY SESSIONS QUERY
@@ -1783,7 +1781,6 @@
1783SCOREBOARD_STATISTICS DATA_DICTIONARY SCOREBOARD_SIZE1781SCOREBOARD_STATISTICS DATA_DICTIONARY SCOREBOARD_SIZE
1784SESSIONS DATA_DICTIONARY COMMAND1782SESSIONS DATA_DICTIONARY COMMAND
1785SESSIONS DATA_DICTIONARY HAS_GLOBAL_LOCK1783SESSIONS DATA_DICTIONARY HAS_GLOBAL_LOCK
1786SESSIONS DATA_DICTIONARY IS_ADMIN
1787SESSIONS DATA_DICTIONARY IS_CONSOLE1784SESSIONS DATA_DICTIONARY IS_CONSOLE
1788SESSIONS DATA_DICTIONARY IS_INTERACTIVE1785SESSIONS DATA_DICTIONARY IS_INTERACTIVE
1789SESSIONS DATA_DICTIONARY QUERY1786SESSIONS DATA_DICTIONARY QUERY
@@ -2372,7 +2369,6 @@
2372SCOREBOARD_STATISTICS DATA_DICTIONARY SCOREBOARD_SIZE2369SCOREBOARD_STATISTICS DATA_DICTIONARY SCOREBOARD_SIZE
2373SESSIONS DATA_DICTIONARY COMMAND2370SESSIONS DATA_DICTIONARY COMMAND
2374SESSIONS DATA_DICTIONARY HAS_GLOBAL_LOCK2371SESSIONS DATA_DICTIONARY HAS_GLOBAL_LOCK
2375SESSIONS DATA_DICTIONARY IS_ADMIN
2376SESSIONS DATA_DICTIONARY IS_CONSOLE2372SESSIONS DATA_DICTIONARY IS_CONSOLE
2377SESSIONS DATA_DICTIONARY IS_INTERACTIVE2373SESSIONS DATA_DICTIONARY IS_INTERACTIVE
2378SESSIONS DATA_DICTIONARY QUERY2374SESSIONS DATA_DICTIONARY QUERY
23792375
=== modified file 'plugin/session_dictionary/sessions.cc'
--- plugin/session_dictionary/sessions.cc 2011-05-23 22:30:39 +0000
+++ plugin/session_dictionary/sessions.cc 2011-06-13 17:52:29 +0000
@@ -51,7 +51,6 @@
51 add_field("QUERY", plugin::TableFunction::STRING, PROCESS_LIST_WIDTH, true);51 add_field("QUERY", plugin::TableFunction::STRING, PROCESS_LIST_WIDTH, true);
52 add_field("HAS_GLOBAL_LOCK", plugin::TableFunction::BOOLEAN, 0, false);52 add_field("HAS_GLOBAL_LOCK", plugin::TableFunction::BOOLEAN, 0, false);
53 add_field("IS_INTERACTIVE", plugin::TableFunction::BOOLEAN, 0, false);53 add_field("IS_INTERACTIVE", plugin::TableFunction::BOOLEAN, 0, false);
54 add_field("IS_ADMIN", plugin::TableFunction::BOOLEAN, 0, false);
55 add_field("IS_CONSOLE", plugin::TableFunction::BOOLEAN, 0, false);54 add_field("IS_CONSOLE", plugin::TableFunction::BOOLEAN, 0, false);
56}55}
5756
@@ -131,9 +130,6 @@
131 /* IS_INTERACTIVE */130 /* IS_INTERACTIVE */
132 push(tmp->getClient()->isInteractive());131 push(tmp->getClient()->isInteractive());
133132
134 /* IS_ADMIN */
135 push(tmp->getClient()->isAdmin());
136
137 /* IS_CONSOLE */133 /* IS_CONSOLE */
138 push(tmp->getClient()->isConsole());134 push(tmp->getClient()->isConsole());
139135
140136
=== modified file 'tests/valgrind.supp'
--- tests/valgrind.supp 2011-06-09 13:26:35 +0000
+++ tests/valgrind.supp 2011-06-13 17:52:29 +0000
@@ -48,7 +48,7 @@
4848
49{49{
50 glibc nss issue50 glibc nss issue
51 Memcheck:Cond51 Memcheck:Leak
52 ...52 ...
53 fun:__nss_database_lookup53 fun:__nss_database_lookup
54 ...54 ...