Merge lp:drizzle/7.0 into lp:~drizzle-trunk/drizzle/development
Proposed by
Brian Aker
Status: | Merged |
---|---|
Approved by: | Brian Aker |
Approved revision: | 2243 |
Merged at revision: | 2264 |
Proposed branch: | lp:drizzle/7.0 |
Merge into: | lp:~drizzle-trunk/drizzle/development |
Diff against target: |
169 lines (+72/-2) (has conflicts) 5 files modified
drizzled/sql_yacc.yy (+19/-1) drizzled/symbol_hash.gperf (+3/-1) plugin/transaction_log/plugin.am (+13/-0) tests/suite/mysql_compatibility/r/character_sets.result (+16/-0) tests/suite/mysql_compatibility/t/character_sets.test (+21/-0) Text conflict in plugin/transaction_log/plugin.am |
To merge this branch: | bzr merge lp:drizzle/7.0 |
Related bugs: | |
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Drizzle Merge Team | Pending | ||
Review via email: mp+56067@code.launchpad.net |
Description of the change
Update stable to trunk.
To post a comment you must log in.