lp:~xpan/mysql-server/5.6

Created by Xin Pan on 2014-05-15 and last modified on 2014-08-13
Get this branch:
bzr branch lp:~xpan/mysql-server/5.6
Only Xin Pan can upload to this branch. If you are Xin Pan please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Xin Pan
Project:
MySQL Server
Status:
Development

Recent revisions

5089. By Xin Pan <email address hidden> on 2014-08-13

Merge MySQL 5.6.20

5088. By Xin Pan <email address hidden> on 2014-07-15

Merge MySQL 5.6.19

5087. By Xin Pan <email address hidden> on 2014-05-15

Merge MySQL 5.6.17

5086. By Liang Guo on 2013-10-03

Merge MySQL 5.6.13

5085. By Tor Didriksen <email address hidden> on 2013-05-21

Backport of fix for:
Bug#69119 Bug#16760474 Wrong FOUND_ROWS() on MySQL 5.6.11

5084. By Balasubramanian Kandasamy on 2013-05-13

Updated copyright year information

5083. By Balasubramanian Kandasamy on 2013-05-13

 Adding fix for Bug#16798868

5082. By Marko Mäkelä <email address hidden> on 2013-05-09

Push to 5.6.12 release clone:

------------------------------------------------------------
revno: 5097
revision-id: <email address hidden>
parent: <email address hidden>
committer: Marko Mäkelä <email address hidden>
branch nick: mysql-5.6
timestamp: Wed 2013-05-08 23:16:55 +0300
message:
  Bug#16774118 RACE CONDITION IN BLOB ACCESS DURING ONLINE ALTER TABLE

  This is a race condition in BLOB access during online ALTER TABLE,
  when applying the table modification log for other than the very last
  log block.

  row_log_table_apply_convert_mrec(): Acquire the index B-tree lock to
  protect the access to log->blobs and the BLOB page itself.

  rb#2401 approved by Kevin Lewis

5081. By mrainb0w on 2013-05-06

Bug #16722314 FOREIGN KEY ID MODIFIED DURING EXPORT
Bug #16754901 PARS_INFO_FREE NOT CALLED IN DICT_CREATE_ADD_FOREIGN_TO_DICTIONARY

Merging the fix from mysql-5.6 to mysql-5.6.12-release.

5080. By Jon Olav Hauglid on 2013-05-06

Bug#16757869: INNODB: POSSIBLE REGRESSION IN 5.5.31, BUG#16004999

The problem was that if UPDATE with subselect caused a
deadlock inside InnoDB, this deadlock was not properly
handled by the SQL layer. This meant that the SQL layer
would try to unlock the row after InnoDB had rolled
back the transaction. This caused an assertion inside
InnoDB.

This patch fixes the problem by checking for errors
reported by SQL_SELECT::skip_record() and not calling
unlock_row() if any errors have been reported.

This bug is similar to Bug#13586591, but for UPDATE
rather than DELETE. Similar issues in filesort/opt_range/
sql_select will be investigated and handled in the scope
of Bug#16767929

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:mysql-server
This branch contains Public information 
Everyone can see this information.

Subscribers