mariadb/innobase
unknown 9b762ae343 Applied innodb snapshot ss792 and ss854.
This ChangeSet will be null-merged to mysql-5.1.

Bugs fixed:
- Bug #21638:  InnoDB: possible segfault in page_copy_rec_list_end_no_locks
  If prefix_len is specified, write it to the insert buffer instead of type->len
- bug #10746:  InnoDB: Error: stored_select_lock_type is 0 inside ::start_stmt()!
  INSERT ... SELECT uses LOCK_NONE in innodb_locks_unsafe_for_binlog mode, so do
  not check for LOCK_X or LOCK_S in start_stmt()


innobase/ibuf/ibuf0ibuf.c:
  Applied innodb snapshot ss792 and ss854.
  
  ibuf_entry_build(): Write prefix_len to the insert buffer instead of type->len
  when prefix_len is specified.  Otherwise, btr_page_reorganize() during
  insert buffer merge would fail on ROW_FORMAT=COMPACT tables.  (Bug #21638)
innobase/include/data0type.h:
  Applied innodb snapshot ss792 and ss854.
  
  ibuf_entry_build(): Write prefix_len to the insert buffer instead of type->len
  when prefix_len is specified.  Otherwise, btr_page_reorganize() during
  insert buffer merge would fail on ROW_FORMAT=COMPACT tables.  (Bug #21638)
innobase/include/data0type.ic:
  Applied innodb snapshot ss792 and ss854.
  
  ibuf_entry_build(): Write prefix_len to the insert buffer instead of type->len
  when prefix_len is specified.  Otherwise, btr_page_reorganize() during
  insert buffer merge would fail on ROW_FORMAT=COMPACT tables.  (Bug #21638)
sql/ha_innodb.cc:
  Applied innodb snapshot ss792 and ss854.
  
  ha_innobase::start_stmt(): Remove the check for
  prebuilt->stored_select_lock_type being LOCK_X or LOCK_S.
  This would cause false alarms with INSERT ... SELECT, which would use
  LOCK_NONE in innodb_locks_unsafe_for_binlog mode.  (Bug #10746)
2006-09-20 13:00:49 -06:00
..
btr innodb r702 2006-08-18 14:16:11 +02:00
buf innodb r702 2006-08-18 14:16:11 +02:00
data Applied innodb-5.0-ss368 snapshot 2006-03-29 23:04:32 +04:00
db Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
dict innodb r702 2006-08-18 14:16:11 +02:00
dyn Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
eval Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
fil innodb r702 2006-08-18 14:16:11 +02:00
fsp innodb r702 2006-08-18 14:16:11 +02:00
fut Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
ha Applied innodb-5.0-ss368 snapshot 2006-03-29 23:04:32 +04:00
ibuf Applied innodb snapshot ss792 and ss854. 2006-09-20 13:00:49 -06:00
include Applied innodb snapshot ss792 and ss854. 2006-09-20 13:00:49 -06:00
lock Changes from the innodb-5.0-ss115 snapshot. 2006-01-16 14:32:43 +03:00
log innodb r702 2006-08-18 14:16:11 +02:00
mach Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
mem Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
mtr Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
os innodb r702 2006-08-18 14:16:11 +02:00
page Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
pars Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
que Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
read Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
rem Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for 2005-12-12 21:06:59 +03:00
row innodb r702 2006-08-18 14:16:11 +02:00
srv innodb r702 2006-08-18 14:16:11 +02:00
sync Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-27 23:43:20 +03:00
thr Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
trx Changes from the innodb-5.0-ss115 snapshot. 2006-01-16 14:32:43 +03:00
usr Removed innobase/my_cnf, innobase/include/makefilewin.i, 2005-10-26 20:06:08 +04:00
ut innodb r702 2006-08-18 14:16:11 +02:00
CMakeLists.txt Additional files for cmake support 2006-08-31 19:52:42 +02:00
configure.in WL#2286 - Compile MySQL w/YASSL support 2005-06-23 21:29:44 +05:00
Makefile.am make dist changes for Cmake build 2006-09-01 10:32:12 +02:00