Merge with MySQL 5.5.32
Bug #1196149 reported by
Alex Yurchenko
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
MySQL patches by Codership |
Fix Released
|
Medium
|
Seppo Jaakola |
Bug Description
bzr merge -r tag:mysql-
Changed in codership-mysql: | |
assignee: | nobody → Seppo Jaakola (seppo-jaakola) |
Changed in codership-mysql: | |
status: | Confirmed → In Progress |
Changed in codership-mysql: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
BTW, as of version 23.7.5, it is no longer possible to obtain the patch in a straightforward way:
5.5-23$ bzr diff -p1 -v --diff-options ' --exclude= .bzrignore ' -r tag:mysql- 5.5.31. .tag:wsrep_ 23.7.5 errors. NoSuchRevision: CHKInventoryRep ository( 'file:/ //home/ ayurchen/ codership/ mysql/5. 5-23/.bzr/ repository/ ') has no revision <email address hidden>
bzr: ERROR: bzrlib.
It looks like some error encroached into the merging process, so it may be better to do a full remerge of the upstream branch:
bzr merge -r tag:mysql-5.5.32 lp:mysql-server/5.5