Merge with 5.1.38

Bug #432098 reported by Seppo Jaakola
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
MySQL patches by Codership
Fix Released
Medium
Seppo Jaakola

Bug Description

Merge with lp:mysql-server release 5.1.38

Changed in codership-mysql:
importance: Undecided → Medium
assignee: nobody → Seppo Jaakola (seppo-jaakola)
milestone: none → 0.7
status: New → In Progress
Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

Used merge command:

 bzr merge -r tag:mysql-5.1.37..tag:mysql-5.1.38 lp:mysql-server

, which resulted in 3 conflicts:
Text conflict in .bzrignore
Text conflict in sql/mysqld.cc
Text conflict in support-files/mysql.spec.sh

Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

LOCK_delete mutex has been removed from THD. This resulted in build errors:

handler/ha_innodb.cc:8832: error: ‘class THD’ has no member named ‘LOCK_delete’
handler/ha_innodb.cc:8834: error: ‘class THD’ has no member named ‘LOCK_delete’
handler/ha_innodb.cc:8910: error: ‘class THD’ has no member named ‘LOCK_delete’
handler/ha_innodb.cc:8912: error: ‘class THD’ has no member named ‘LOCK_delete’

Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

sqlgen test passes now, further issues are tracked through separate bug reports

Changed in codership-mysql:
status: In Progress → Fix Committed
Changed in codership-mysql:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.