Merge lp://qastaging/~brianaker/drizzle/catalogs into lp://qastaging/drizzle/7.0
Proposed by
Brian Aker
| Status: | Merged |
|---|---|
| Approved by: | Brian Aker |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2080 |
| Proposed branch: | lp://qastaging/~brianaker/drizzle/catalogs |
| Merge into: | lp://qastaging/drizzle/7.0 |
| Diff against target: |
1387 lines (+515/-133) 36 files modified
drizzled/catalog.cc (+0/-12) drizzled/catalog.h (+1/-10) drizzled/catalog/cache.cc (+22/-16) drizzled/catalog/cache.h (+13/-13) drizzled/error.cc (+12/-9) drizzled/error.h (+1/-1) drizzled/error_t.h (+5/-2) drizzled/identifier/catalog.cc (+12/-1) drizzled/identifier/catalog.h (+4/-0) drizzled/include.am (+7/-0) drizzled/lex_string.h (+3/-3) drizzled/parser.h (+1/-0) drizzled/plugin.h (+0/-1) drizzled/plugin/catalog.cc (+6/-6) drizzled/plugin/storage_engine.cc (+60/-14) drizzled/plugin/storage_engine.h (+7/-4) drizzled/sql_lex.cc (+9/-6) drizzled/sql_lex.h (+1/-1) drizzled/sql_parse.cc (+1/-1) drizzled/sql_table.cc (+12/-13) drizzled/sql_yacc.yy (+25/-4) drizzled/statement.h (+2/-3) drizzled/statement/catalog.cc (+48/-0) drizzled/statement/catalog.h (+56/-0) drizzled/statement/catalog/create.cc (+47/-0) drizzled/statement/catalog/create.h (+45/-0) drizzled/statement/catalog/drop.cc (+47/-0) drizzled/statement/catalog/drop.h (+44/-0) drizzled/statement/create_index.h (+2/-3) drizzled/symbol_hash.gperf (+1/-0) drizzled/table_proto_write.cc (+3/-3) plugin/catalog/tests/r/drop.result (+1/-1) plugin/catalog/tests/r/sql.result (+4/-0) plugin/catalog/tests/t/sql.test (+7/-0) tests/r/broken_table_proto_file.result (+1/-1) tests/r/type_enum.result (+5/-5) |
| To merge this branch: | bzr merge lp://qastaging/~brianaker/drizzle/catalogs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Small update, because of changes in trunk, there is no longer a need for a custom error_t.
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
