Merge lp://qastaging/~hartmut-php/drizzle/drizzle-make-lcov into lp://qastaging/drizzle/7.0
Proposed by
Monty Taylor
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | 1749 |
| Merge reported by: | Lee Bieber |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~hartmut-php/drizzle/drizzle-make-lcov |
| Merge into: | lp://qastaging/drizzle/7.0 |
| Diff against target: |
6002 lines (+120/-5704) 15 files modified
.bzrignore (+8/-0) Makefile.am (+2/-0) config/lcov.am (+42/-0) configure.ac (+7/-1) drizzled/include.am (+6/-1) plugin/innobase/include/pars0grm.h (+0/-236) plugin/innobase/pars/lexyy.c (+0/-2777) plugin/innobase/pars/make_bison.sh (+0/-32) plugin/innobase/pars/make_flex.sh (+0/-48) plugin/innobase/pars/pars0grm.c (+0/-2584) plugin/innobase/pars/pars0grm.y (+2/-3) plugin/innobase/pars/pars0lex.l (+0/-14) plugin/innobase/plugin.ac (+8/-1) plugin/innobase/plugin.am (+44/-7) po/POTFILES.in (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~hartmut-php/drizzle/drizzle-make-lcov |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Merge Team | Pending | ||
|
Review via email:
|
|||
Description of the change
This is a build fix from Hartmut which seems like a solid thing to go into elliot.
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
