Merge lp://qastaging/~brianaker/drizzle/fix-equal-bad-proto-elliot into lp://qastaging/drizzle/7.0
Proposed by
Brian Aker
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | 2241 |
| Merged at revision: | 2240 |
| Proposed branch: | lp://qastaging/~brianaker/drizzle/fix-equal-bad-proto-elliot |
| Merge into: | lp://qastaging/drizzle/7.0 |
| Diff against target: |
205 lines (+63/-31) 6 files modified
drizzled/include.am (+1/-0) drizzled/message.h (+1/-17) drizzled/message/replication_options.h (+47/-0) drizzled/message/table.proto (+1/-1) drizzled/sql_yacc.yy (+12/-12) plugin/innobase/dict/create_replication.cc (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~brianaker/drizzle/fix-equal-bad-proto-elliot |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
This fixes two issues in the GA:
1) In the parser we were using wrong = for some cases of options.
2) For the replication table we used the original proto option over the one that was used in the final GA.
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
