Merge lp://qastaging/~brianaker/drizzle/regression-520784 into lp://qastaging/drizzle/7.0
Proposed by
Brian Aker
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | no longer in the source branch. |
| Merge reported by: | Lee Bieber |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~brianaker/drizzle/regression-520784 |
| Merge into: | lp://qastaging/drizzle/7.0 |
| Diff against target: |
1019 lines (+256/-217) 28 files modified
drizzled/base.h (+1/-78) drizzled/error.cc (+2/-0) drizzled/error_t.h (+62/-0) drizzled/plugin/schema_engine.cc (+1/-1) drizzled/plugin/storage_engine.cc (+111/-76) drizzled/plugin/storage_engine.h (+17/-7) drizzled/session.cc (+4/-3) drizzled/sql_base.cc (+1/-1) drizzled/sql_insert.cc (+2/-2) drizzled/sql_table.cc (+16/-13) drizzled/table/instance.cc (+3/-1) plugin/blitzdb/blitzindex.cc (+8/-8) plugin/function_engine/function.h (+2/-2) plugin/memory/heap_priv.h (+1/-1) plugin/memory/hp_delete.cc (+2/-2) plugin/memory/hp_rectest.cc (+1/-1) plugin/memory/hp_rrnd.cc (+2/-2) plugin/memory/hp_rsame.cc (+2/-2) plugin/memory/hp_scan.cc (+2/-2) plugin/myisam/mi_rprev.cc (+2/-2) plugin/schema_engine/schema.h (+4/-3) plugin/tableprototester/tableprototester.cc (+2/-2) plugin/tableprototester/tests/r/drop_table.result (+1/-1) plugin/tableprototester/tests/t/drop_table.test (+1/-1) tests/r/broken_table_proto_file.result (+1/-1) tests/r/create.result (+2/-2) tests/t/broken_table_proto_file.test (+1/-1) tests/t/create.test (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~brianaker/drizzle/regression-520784 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Fixed bug mentioned in branch name. Essentially we now do a loop through engines to find the engine instead of doing a loop through the definitions and then pick out the particular engines. We also now pass in error and can look at the response (also, engines now use an actual error instead of a mix of define/etc).
A full scale fix for all engines to use error_t was beyond the scope of this patch and would have required a lot more refactoring to do. TBDL
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
