lp:~stewart/drizzle/update-innobase-1.1.3
- Get this branch:
- bzr branch lp:~stewart/drizzle/update-innobase-1.1.3
Branch merges
- Drizzle Developers: Pending requested
-
Diff: 3297 lines (+880/-956)71 files modifieddrizzled/function/min_max.cc (+15/-1)
drizzled/session.cc (+1/-1)
drizzled/sql_insert.cc (+2/-3)
drizzled/sql_update.cc (+1/-10)
drizzled/table.cc (+61/-5)
drizzled/table.h (+2/-1)
plugin/innobase/COPYING (+0/-351)
plugin/innobase/COPYING.Sun_Microsystems (+0/-31)
plugin/innobase/ChangeLog (+26/-0)
plugin/innobase/Doxyfile (+1/-1)
plugin/innobase/btr/btr0btr.c (+4/-7)
plugin/innobase/btr/btr0cur.c (+16/-6)
plugin/innobase/btr/btr0pcur.c (+0/-2)
plugin/innobase/btr/btr0sea.c (+1/-2)
plugin/innobase/buf/buf0flu.c (+6/-1)
plugin/innobase/dict/dict0crea.c (+0/-2)
plugin/innobase/dict/dict0dict.c (+40/-37)
plugin/innobase/dict/dict0load.c (+89/-23)
plugin/innobase/eval/eval0eval.c (+1/-6)
plugin/innobase/handler/ha_innodb.cc (+58/-36)
plugin/innobase/ibuf/ibuf0ibuf.c (+6/-13)
plugin/innobase/include/btr0cur.h (+3/-2)
plugin/innobase/include/buf0flu.h (+2/-2)
plugin/innobase/include/db0err.h (+3/-0)
plugin/innobase/include/dict0dict.h (+16/-0)
plugin/innobase/include/dict0dict.ic (+42/-0)
plugin/innobase/include/dict0load.h (+2/-0)
plugin/innobase/include/dict0mem.h (+21/-0)
plugin/innobase/include/os0sync.h (+1/-1)
plugin/innobase/include/que0que.h (+3/-0)
plugin/innobase/include/srv0srv.h (+3/-1)
plugin/innobase/include/univ.i (+1/-13)
plugin/innobase/include/ut0rbt.h (+1/-1)
plugin/innobase/include/ut0rnd.ic (+0/-3)
plugin/innobase/log/log0recv.c (+4/-6)
plugin/innobase/os/os0file.c (+3/-22)
plugin/innobase/plugin.am (+1/-7)
plugin/innobase/plugin.ini (+1/-3)
plugin/innobase/que/que0que.c (+0/-5)
plugin/innobase/row/row0merge.c (+1/-1)
plugin/innobase/row/row0mysql.c (+54/-3)
plugin/innobase/row/row0purge.c (+9/-2)
plugin/innobase/row/row0sel.c (+60/-45)
plugin/innobase/row/row0umod.c (+6/-1)
plugin/innobase/row/row0upd.c (+7/-5)
plugin/innobase/row/row0vers.c (+8/-3)
plugin/innobase/srv/srv0srv.c (+20/-1)
plugin/innobase/srv/srv0start.c (+20/-1)
plugin/innobase/tests/r/index_merge_innodb.result (+55/-0)
plugin/innobase/tests/r/innodb_bug56716.result (+4/-0)
plugin/innobase/tests/r/innodb_bug57255.result (+10/-0)
plugin/innobase/tests/r/innodb_mysql.result (+32/-0)
plugin/innobase/tests/t/innodb-autoinc.test (+12/-0)
plugin/innobase/tests/t/innodb_bug53756.test (+2/-2)
plugin/innobase/tests/t/innodb_bug56716.test (+10/-0)
plugin/innobase/tests/t/innodb_bug57255.test (+38/-0)
plugin/innobase/tests/t/innodb_mysql.test (+28/-0)
plugin/innobase/trx/trx0purge.c (+4/-8)
plugin/innobase/trx/trx0roll.c (+0/-5)
plugin/innobase/trx/trx0sys.c (+7/-2)
plugin/innobase/trx/trx0trx.c (+1/-2)
plugin/innobase/trx/trx0undo.c (+0/-5)
plugin/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c (+0/-43)
plugin/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c (+0/-54)
plugin/innobase/ut/ut0auxconf_have_gcc_atomics.c (+0/-61)
plugin/innobase/ut/ut0auxconf_have_solaris_atomics.c (+0/-39)
plugin/innobase/ut/ut0auxconf_pause.c (+0/-32)
plugin/innobase/ut/ut0auxconf_sizeof_pthread_t.c (+0/-35)
plugin/innobase/ut/ut0ut.c (+2/-0)
po/POTFILES.in (+0/-1)
tests/include/index_merge2.inc (+53/-0)
Branch information
Recent revisions
- 2483. By Stewart Smith
-
remove innobase COPYING.
Sun_Microsystem s file from extra_dist. has been removed (redundant copy of GPL) - 2482. By Stewart Smith
-
remove innobase COPYING file from extra_dist. has been removed (redundant copy of GPL
- 2480. By jimmy
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Jimmy Yang <email address hidden>
Original commit message:
A more complete fix for bug #57345 btr_pcur_store_position abort for load
with concurrent lock/unlock tablesApproved by Marko
- 2479. By Sunny Bains
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Sunny Bains <email address hidden>
Original commit message:
Bug# 56982 Assertion Failure from ha_innobase::innobase_ peek_autoinc( ) when auto_inc > 0 Print an error message to stderr an get rid of the assertion.
Approved by: Jimmy Yang (over IM)
- 2478. By Martin
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Martin Hansson <email address hidden>
Original commit message:
Bug#56423: Different count with SELECT and CREATE SELECT queriesThis is a regression from the fix for bug no 38999. A storage engine capable
of reading only a subset of a table's columns updates corresponding bits in
the read buffer to signal that it has read NULL values for the corresponding
columns. It cannot, and should not, update any other bits. Bug no 38999
occurred because the implementation of UPDATE statements compare the NULL bits
using memcmp, inadvertently comparing bits that were never requested from the
storage engine. The regression was caused by the storage engine trying to
alleviate the situation by writing to all NULL bits, even those that it had no
knowledge of. This has devastating effects for the index merge algorithm,
which relies on all NULL bits, except those explicitly requested, being left
unchanged.The fix reverts the fix for bug no 38999 in both InnoDB and InnoDB plugin and
changes the server's method of comparing records. For engines that always read
entire rows, we proceed as usual. For engines capable of reading only select
columns, the record buffers are now compared on a column by column basis. An
assertion was also added so that non comparable buffers are never read. Some
relevant copy-pasted code was also consolidated in a new function. - 2477. By Stewart Smith
-
make innodb_bug57255 test run 10-20 times faster (use a txn when loading data)
- 2476. By jimmy
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Jimmy Yang <email address hidden>
Original commit message:
Fix Bug #57255 Cascade Delete results in "Got error -1 from storage engine".rb://477 approved by Marko
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:drizzle/7.0