lp:~stewart/haildb/merge-innodb-plugin

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

Bug #652684: Obey KILL during a lock wait	Medium	Fix Released
Bug #652822: can create indexes with TEMP_INDEX_PREFIX (which are invalid names)	Low	Fix Released

Link a bug report

Related blueprints

83. By Marko Makela <email address hidden> on 2010-10-04

Merge fix from InnoDB from MySQL 5.1.47

revno: 2661.607.47
revision-id: <email address hidden>
parent: <email address hidden>
committer: Marko Mkel <email address hidden>
branch nick: 5.1-innodb
timestamp: Thu 2010-04-22 12:33:42 +0300
message:
  Correct the definition of DICT_SYS_INDEXES_NAME_FIELD.
  When row_merge_drop_temp_indexes() was reworked to drop the indexes
  via the data dictionary cache, the code was broken because it would
  read the index name from the wrong field.
modified:
  storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
  storage/innodb_plugin/dict/dict0boot.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0boot.c
  storage/innodb_plugin/include/dict0boot.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fdict0boot.h

82. By Marko Makela <email address hidden> on 2010-10-04

Merge fix from InnoDB from MySQL 5.1.47:

revno: 2661.607.46
revision-id: <email address hidden>
parent: <email address hidden>
committer: Marko Mkel <email address hidden>
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 21:53:59 +0300
message:
  btr_page_split_and_insert(): Avoid an infinite loop. (Bug #52964)

  btr_page_tuple_smaller(): New function, refactored from
  btr_page_split_and_insert().

  btr_page_get_split_rec(): Renamed from btr_page_get_sure_split_rec().
  Note that a NULL return may mean that the tuple is to be inserted into
  either the lower or upper page, to be determined by btr_page_tuple_smaller().

  btr_page_split_and_insert(): When btr_page_get_split_rec() returns NULL,
  invoke btr_page_tuple_smaller() to determine which half-page the tuple
  belongs to.

  Reviewed by Sunny Bains
modified:
  storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
  storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c

81. By Marko Makela <email address hidden> on 2010-10-04

Merge InnoDB fix from MySQL 5.1.47

revno: 2661.607.43
revision-id: <email address hidden>
parent: <email address hidden>
committer: Marko Mkel <email address hidden>
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 12:50:33 +0300
message:
  dtuple_convert_big_rec(): Store locally any fields whose maximum length
  is less than 256 bytes. (Bug #52745)
  Add related comments and debug assertions to the "offsets"
  functions in rem0rec.c.
  Approved by Sunny Bains
modified:
  storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
  storage/innodb_plugin/data/data0data.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdata%2Fdata0data.c
  storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c

80. By Marko Makela <email address hidden> on 2010-10-04

Merge InnoDB Fix From MySQL 5.1.47

revno: 2661.607.41
revision-id: <email address hidden>
parent: <email address hidden>
committer: Marko Mkel <email address hidden>
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 12:16:11 +0300
message:
  rec_convert_dtuple_to_rec(): Correct the debug check.
  The "extern" accessor functions return zero or nonzero, not 0 or 1.
modified:
  storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c

79. By Marko Makela <email address hidden> on 2010-10-04

Merge InnoDB fix from MySQL 5.1.47

revno: 2661.607.40
revision-id: <email address hidden>
parent: <email address hidden>
committer: Marko Mkel <email address hidden>
branch nick: 5.1-innodb
timestamp: Wed 2010-04-21 09:39:16 +0300
message:
  rec_convert_dtuple_to_rec(): Add a debug check.
modified:
  storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c

78. By Marko Makela <email address hidden> on 2010-10-04

Merge InnoDB patch from MySQL 5.1.47:

revno: 2661.607.39
revision-id: <email address hidden>
parent: <email address hidden>
committer: Marko Makela <email address hidden>
branch nick: 5.1-innodb
timestamp: Tue 2010-04-20 23:15:50 +0300
message:
  btr_cur_optimistic_insert(): Remove unused variable "heap".
modified:
  storage/innodb_plugin/btr/btr0cur.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0cur.c

77. By Marko Mäkelä <email address hidden> on 2010-10-04

Merge InnoDB revision from MySQL 5.1.47:

revno: 2661.607.37
revision-id: <email address hidden>
parent: <email address hidden>
committer: Marko Mkel <email address hidden>
branch nick: 5.1-innodb
timestamp: Tue 2010-04-20 11:29:08 +0300
message:
  Implement UNIV_BTR_AVOID_COPY, an optimization of page splits.
modified:
  storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
  storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
  storage/innodb_plugin/include/univ.i 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Funiv.i

76. By Marko =?ISO-8859-1?Q?M=E4kel=E4?= <email address hidden> on 2010-10-04

Merge InnoDB from MySQL 5.1.47:

revno: 2661.607.36
committer: Marko =?ISO-8859-1?Q?M=E4kel=E4?= <email address hidden>
branch nick: 5.1-innodb
timestamp: Mon 2010-04-19 13:36:03 +0300
message:
  Enable UNIV_DEBUG_VALGRIND when HAVE_purify is set.
modified:
  storage/innobase/include/univ.i
  storage/innodb_plugin/include/univ.i

75. By Marko Makela <email address hidden> on 2010-10-04

Merge fix from InnoDB (5.1.46 -> 5.1.47)

revno: 2661.607.33
revision-id: <email address hidden>
parent: <email address hidden>
committer: Marko Makela <email address hidden>
branch nick: mysql-5.1-innodb
timestamp: Thu 2010-04-15 09:01:22 +0200
message:
  storage/innodb_plugin: Relax too strict assertions about prefix
  indexed BLOBs for ROW_FORMAT=DYNAMIC and ROW_FORMAT_COMPRESSED tables
  (Bug #52746). In these tables, the locally stored prefix of a BLOB can
  be as small as 20 bytes (BTR_EXTERN_FIELD_REF_SIZE). ROW_FORMAT=REDUNDANT
  and ROW_FORMAT=COMPACT store a prefix of 768 bytes (REC_MAX_INDEX_COL_LEN).

  trx_undo_rec_get_col_val(): Relax the ut_ad() assertion and add a
  reference to dtuple_convert_big_rec().

  trx_undo_rec_get_partial_row(): Relax the ut_a() assertion that
  prompted Bug #52746.
modified:
  storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
  storage/innodb_plugin/trx/trx0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Ftrx%2Ftrx0rec.c

74. By vdimov on 2010-10-04

Merge fix from InnoDb SVN:

revno: 0.4.3
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6967
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6966
committer: vdimov
timestamp: Wed 2010-04-07 18:40:38 +0000
message:
  branches/zip: Whitespace fixup in univ.i
modified:
  include/univ.i 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Funiv.i