mariadb/storage/innobase
Marko Mäkelä fdafbdfb86 Merge Bug#54686 fix from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3517
revision-id: marko.makela@oracle.com-20100622115215-kxtzx7xuugcxd375
parent: marko.makela@oracle.com-20100621095148-8g73k8k68dpj080u
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Tue 2010-06-22 14:52:15 +0300
message:
  Bug#54686 "field->col->mtype == type" assertion error at row/row0sel.c
  ha_innobase::index_read(), ha_innobase::records_in_range(): Check that
  the index is useable before invoking row_sel_convert_mysql_key_to_innobase().

  This fix is based on a suggestion by Yasufumi Kinoshita.
2010-06-22 15:05:33 +03:00
..
btr Merge a change from mysql-5.1-innodb: 2010-06-01 15:09:33 +03:00
buf buf_flush_insert_in_flush_rbt(), buf_flush_validate_low(): 2010-06-22 13:43:17 +03:00
data Merge r3403..3414 from mysql-5.1-innodb: 2010-04-22 14:24:42 +03:00
dict dict_load_column_low(): Initialize pos. Improve documentation. 2010-06-22 13:42:39 +03:00
dyn Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
eval Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
fil Merge Bug #54658 fix from mysql-5.1-innodb: 2010-06-21 13:32:39 +03:00
fsp Merge from mysql-5.1-innodb: 2010-05-04 16:57:09 +03:00
fut Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
ha Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
handler Merge Bug#54686 fix from mysql-5.1-innodb: 2010-06-22 15:05:33 +03:00
ibuf Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
include dict_load_column_low(): Initialize pos. Improve documentation. 2010-06-22 13:42:39 +03:00
lock Merge from mysql-5.1-innodb: 2010-06-02 14:37:33 +03:00
log Fix bug#53499 - purge thread is active during shutdown, assert buf/buf0buf.c line 4115. 2010-05-10 13:17:17 +10:00
mach Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
mem Fix bug #52546, crash on shutdown of plugin with innodb_use_sys_malloc=0. 2010-05-17 01:57:42 -07:00
mtr Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
mysql-test/patches Move InnoDB tests from storage/innobase/mysql-test/ (where they were ignored) 2010-04-14 14:14:48 +03:00
os Add two debug assertions and a comment to make it clear that 2010-05-27 20:30:08 +03:00
page Merge a change from mysql-5.1-innodb: 2010-05-19 12:36:27 +03:00
pars Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
que Remove references to srv0que.h. 2010-05-12 12:20:26 +10:00
read Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
rem Merge from mysql-5.1-innodb: 2010-05-11 19:18:28 +03:00
row Fixes bug#39168. 2010-06-21 11:52:09 -04:00
srv This change splits innodb_file_format_check into innodb_file_format_check 2010-06-17 02:13:53 -07:00
sync Merge a change from mysql-5.1-innodb: 2010-06-01 17:03:55 +03:00
thr Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
trx This change splits innodb_file_format_check into innodb_file_format_check 2010-06-17 02:13:53 -07:00
usr Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mysql-trunk-merge. 2009-12-02 19:30:50 +05:30
ut ut_strerr(): Handle DB_SUCCESS_LOCKED_REC. 2010-06-02 14:52:11 +03:00
CMakeLists.txt Clean up CMake file by removing duplicate entry for Windows. 2010-05-07 15:37:34 -05:00
compile-innodb Update compile-innodb to use cmake and remove the debug version. 2010-04-15 12:33:07 +03:00
COPYING Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Google Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Percona Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Sun_Microsystems Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
Doxyfile Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
ha_innodb.def Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
Makefile.am Merge mysql-trunk-bugfixing -> mysql-trunk-innodb 2010-05-19 23:48:50 +03:00
plug.in Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00