mariadb/storage/innobase
Vasil Dimov 48d1faabf0 Merge from mysql-5.1-innodb:
------------------------------------------------------------
  revno: 3437
  revision-id: marko.makela@oracle.com-20100504093128-44v6glupe1dsh0ug
  parent: marko.makela@oracle.com-20100503122859-k73bl51re93o0mt4
  committer: Marko M?kel? <marko.makela@oracle.com>
  branch nick: 5.1-innodb
  timestamp: Tue 2010-05-04 12:31:28 +0300
  message:
    btr_page_split_and_insert(): Correct the fix of Bug #52964.
    When split_rec==NULL, choose the correct node pointer key (first_rec).
  modified:
    storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
  ------------------------------------------------------------
2010-05-04 16:45:44 +03:00
..
btr Merge from mysql-5.1-innodb: 2010-05-04 16:45:44 +03:00
buf Merge from mysql-5.1-innodb: 2010-05-04 13:58:43 +03:00
data Merge r3403..3414 from mysql-5.1-innodb: 2010-04-22 14:24:42 +03:00
dict Followup to vasil.dimov@oracle.com-20100504104629-0ovtc5lae2ghn7he : 2010-05-04 14:47:35 +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 Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
fsp Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +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 Followup to vasil.dimov@oracle.com-20100504104629-0ovtc5lae2ghn7he : 2010-05-04 14:45:34 +03:00
ibuf Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
include Merge from mysql-5.1-innodb: 2010-05-04 13:54:13 +03:00
lock Merge from mysql-5.1-innodb: 2010-05-04 13:52:14 +03:00
log Merge from mysql-5.1-innodb: 2010-05-04 13:54:13 +03: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 Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03: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 Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
page Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
pars Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
que Set the slot to NULL when creating a query thread. 2010-05-04 10:07:51 +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 r3403..3414 from mysql-5.1-innodb: 2010-04-22 14:24:42 +03:00
row Merge from mysql-5.1-innodb: 2010-05-04 13:52:14 +03:00
srv Add missing semi-colon. 2010-04-30 21:38:12 +10:00
sync Merge from innodb-branches-innodb+ 2010-04-22 12:00:59 +03:00
thr Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
trx Fix bug introduced by r3038. When a transaction is rolled back by the 2010-04-28 06:47:47 +10: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 Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
CMakeLists.txt Merge from innodb-branches-innodb+ 2010-04-22 12:00:59 +03: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 from innodb-branches-innodb+ 2010-04-22 12:00:59 +03:00
plug.in Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00