lp://staging/~codership/codership-mysql/mysql-5.5-hton

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3033. By Seppo Jaakola <seppo@snautseri> on 2011-04-08

merged with MySQL 5.5

3032. By Seppo Jaakola <seppo@snautseri> on 2011-01-03

Preparing to merge with MySQL 5.5:

bzr remove storage/innobase
bzr rename storage/innodb_plugin storage/innobase

3031. By Seppo Jaakola <seppo@snautseri> on 2011-01-03

References lp:696786
Merge command was:
bzr merge -r tag:mysql-5.1.52..tag:mysql-5.1.53 lp:mysql-server/5.1
..no conflicts and builds fine

3030. By Seppo Jaakola <seppo@snautseri> on 2011-01-03

References lp:696785
Merge command:
bzr merge -r tag:mysql-5.1.51..tag:mysql-5.1.52 lp:mysql-server/5.1

No conflicts, builds fine

3029. By Teemu Ollakka on 2010-11-20

References lp:673757

Assign tc_log_dummy to tc_log instead of having ifdefs for not building TC_LOG_MMAP

3028. By Teemu Ollakka on 2010-11-19

References lp:673757

- Set wsrep_hton stmt ha_info read/write in THD::binlog_start_trans_and_stmt()
- Fix for lp:518749 regression, call thd->binlog_flush_pending_row_events() before wsrep_write_cache()

3027. By Teemu Ollakka on 2010-11-18

References lp:673757 Disable TC_LOG_MMAP in wsrep builds

3026. By Teemu Ollakka on 2010-11-18

References lp:673757

Merged -r 3016..3020 lp:codership-mysql

Merged fixes:

revno: 3020
  References lp:624960 - a better tentative fix for http://bugs.mysql.com/bug.php?id=47134

revno: 3019
  References lp:638027

  Merged header order adjustments to trunk

  merge -r 3037..3039 lp:codership-mysql/0.7

revno: 3018
  References lp:578828

  Merging autocommit retry patch from 0.7 branch:

  merge -r 3034..3037 lp:codership-mysql/0.7

  conflicts:
  Text conflict in sql/sql_class.cc
  Text conflict in sql/sql_class.h
  Text conflict in sql/sql_parse.cc
  Text conflict in storage/innobase/handler/ha_innodb.cc
  Text conflict in storage/innodb_plugin/handler/ha_innodb.cc

revno: 3017
  References lp:609259 - merged wsrep_sst_mysqldump_fix.sql into wsrep_sst_mysqldunp.sh

3025. By Seppo Jaakola <seppo@snautseri> on 2010-11-15

References lp:673757
Rewrote logging with WSREP_* macros

3024. By Seppo Jaakola <seppo@snautseri> on 2010-11-15

References lp:673757
Merged the fix for lp:513515