Merge lp://staging/~dedzone/drizzle/ded-decimal into lp://staging/~drizzle-trunk/drizzle/development
Proposed by
Djellel E. Difallah
| Status: | Merged |
|---|---|
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~dedzone/drizzle/ded-decimal |
| Merge into: | lp://staging/~drizzle-trunk/drizzle/development |
| Diff against target: |
1360 lines (+579/-647) 11 files modified
drizzled/cached_item.h (+1/-1) drizzled/decimal.cc (+223/-0) drizzled/decimal.h (+351/-1) drizzled/field.h (+1/-1) drizzled/hybrid_type.h (+1/-1) drizzled/include.am (+0/-2) drizzled/item.h (+1/-1) drizzled/my_decimal.cc (+0/-243) drizzled/my_decimal.h (+0/-395) drizzled/temporal.cc (+1/-1) support-files/drizzle.spec.in (+0/-1) |
| To merge this branch: | bzr merge lp://staging/~dedzone/drizzle/ded-decimal |
| Related bugs: | |
| Related blueprints: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Monty Taylor | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2010-03-27.
Description of the change
Have just merged decimal and my_decimal, and updated the references then tested it.
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
Wonderful. Looks like you left in a commentted out section of code:
+//#include "drizzled/error.h"
+//#include "drizzled/field.h"
Could you remove those? Otherwise, looks fantastic.