diff options
| author | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-08-18 14:16:11 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@salvation.intern.azundris.com> | 2006-08-18 14:16:11 +0200 |
| commit | 3468780e0cb431bfedc399b1cd0924b3dc0b3ddc (patch) | |
| tree | 27c5a8f1877100abbd3abe5c56aaedb5e46ad964 /innobase/include | |
| parent | 5c8c2ab43b73984889fd6c337523b657861793ea (diff) | |
| download | mariadb-git-3468780e0cb431bfedc399b1cd0924b3dc0b3ddc.tar.gz | |
innodb r702
innodb r719
innobase/btr/btr0btr.c:
innodb r702
innobase/buf/buf0buf.c:
innodb r702
innobase/dict/dict0dict.c:
innodb r702
innobase/fil/fil0fil.c:
innodb r702
innobase/fsp/fsp0fsp.c:
innodb r702
innobase/include/btr0cur.ic:
innodb r719
innobase/include/buf0buf.ic:
innodb r702
innobase/log/log0log.c:
innodb r702
innobase/log/log0recv.c:
innodb r702
innobase/os/os0file.c:
innodb r702
innobase/row/row0mysql.c:
innodb r702
innobase/row/row0sel.c:
innodb r702
innobase/srv/srv0start.c:
innodb r702
innobase/ut/ut0dbg.c:
innodb r702
sql/ha_innodb.cc:
innodb r702
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/btr0cur.ic | 4 | ||||
| -rw-r--r-- | innobase/include/buf0buf.ic | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/innobase/include/btr0cur.ic b/innobase/include/btr0cur.ic index bf8a6efb68d..dcad3e9e14d 100644 --- a/innobase/include/btr0cur.ic +++ b/innobase/include/btr0cur.ic @@ -52,9 +52,7 @@ btr_cur_get_page( /* out: pointer to page */ btr_cur_t* cursor) /* in: tree cursor */ { - page_t* page = buf_frame_align(page_cur_get_rec(&(cursor->page_cur))); - ut_ad(!!page_is_comp(page) == cursor->index->table->comp); - return(page); + return(buf_frame_align(page_cur_get_rec(&(cursor->page_cur)))); } /************************************************************* diff --git a/innobase/include/buf0buf.ic b/innobase/include/buf0buf.ic index d949254d47d..af32db10b5f 100644 --- a/innobase/include/buf0buf.ic +++ b/innobase/include/buf0buf.ic @@ -215,8 +215,8 @@ buf_block_align( "InnoDB: Error: trying to access a stray pointer %p\n" "InnoDB: buf pool start is at %p, end at %p\n" "InnoDB: Probable reason is database corruption or memory\n" -"InnoDB: corruption. If this happens in an InnoDB database recovery,\n" -"InnoDB: you can look from section 6.1 at http://www.innodb.com/ibman.html\n" +"InnoDB: corruption. If this happens in an InnoDB database recovery, see\n" +"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/forcing-recovery.html\n" "InnoDB: how to force recovery.\n", ptr, frame_zero, buf_pool->high_end); @@ -251,8 +251,8 @@ buf_frame_align( "InnoDB: Error: trying to access a stray pointer %p\n" "InnoDB: buf pool start is at %p, end at %p\n" "InnoDB: Probable reason is database corruption or memory\n" -"InnoDB: corruption. If this happens in an InnoDB database recovery,\n" -"InnoDB: you can look from section 6.1 at http://www.innodb.com/ibman.html\n" +"InnoDB: corruption. If this happens in an InnoDB database recovery, see\n" +"InnoDB: http://dev.mysql.com/doc/refman/5.0/en/forcing-recovery.html\n" "InnoDB: how to force recovery.\n", ptr, buf_pool->frame_zero, buf_pool->high_end); |