Merge lp://qastaging/~linuxjedi/drizzle/trunk-bug-686135 into lp://qastaging/drizzle/7.0
Proposed by
Andrew Hutchings
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Brian Aker | ||||||||
| Approved revision: | 2135 | ||||||||
| Merged at revision: | 2137 | ||||||||
| Proposed branch: | lp://qastaging/~linuxjedi/drizzle/trunk-bug-686135 | ||||||||
| Merge into: | lp://qastaging/drizzle/7.0 | ||||||||
| Diff against target: |
933 lines (+239/-277) 17 files modified
docs/installing/ubuntu.rst (+1/-1) drizzled/plugin/listen.cc (+16/-7) drizzled/plugin/listen.h (+24/-4) plugin/drizzle_protocol/drizzle_protocol.cc (+3/-3) plugin/drizzle_protocol/plugin.ini (+0/-1) plugin/drizzle_protocol/status_table.h (+0/-66) plugin/information_schema_dictionary/tests/r/tables.result (+4/-8) plugin/mysql_protocol/mysql_protocol.cc (+8/-100) plugin/mysql_protocol/mysql_protocol.h (+1/-0) plugin/mysql_protocol/plugin.ini (+1/-1) plugin/mysql_protocol/table_function.h (+0/-57) plugin/mysql_unix_socket_protocol/protocol.cc (+1/-0) plugin/protocol_dictionary/dictionary.cc (+98/-0) plugin/protocol_dictionary/dictionary.h (+50/-0) plugin/protocol_dictionary/plugin.ini (+9/-0) plugin/schema_dictionary/tests/r/data_dictionary.result (+21/-25) tests/r/information_schema.result (+2/-4) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~linuxjedi/drizzle/trunk-bug-686135 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lee Bieber (community) | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
Add data_dictionary
Remove the old mysql and drizzle (broken) protocol counters tables
Fix an error in Ubuntu install docs
To post a comment you must log in.
Revision history for this message
| Lee Bieber (kalebral-deactivatedaccount) wrote | # |
review:
Needs Fixing
Revision history for this message
| Lee Bieber (kalebral-deactivatedaccount) wrote | # |
review:
Needs Fixing
Revision history for this message
| Andrew Hutchings (linuxjedi) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Getting valgrind warnings on 32bit
http://