diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-07-08 19:34:49 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-07-08 19:34:49 +0300 |
| commit | c0e8c9a11f0427fe6e0604eaeef5988abdb55210 (patch) | |
| tree | b4e7fbd4d1817aa205132578bc6b11e6dd0fad86 /innobase/btr/btr0btr.c | |
| parent | 9eef017c5750b26b75252a2ac0679f761404d136 (diff) | |
| download | mariadb-git-c0e8c9a11f0427fe6e0604eaeef5988abdb55210.tar.gz | |
Many files:
Merge InnoDB-3.23.52b
innobase/btr/btr0btr.c:
Merge InnoDB-3.23.52b
innobase/btr/btr0cur.c:
Merge InnoDB-3.23.52b
innobase/btr/btr0sea.c:
Merge InnoDB-3.23.52b
innobase/buf/buf0buf.c:
Merge InnoDB-3.23.52b
innobase/ha/ha0ha.c:
Merge InnoDB-3.23.52b
innobase/ibuf/ibuf0ibuf.c:
Merge InnoDB-3.23.52b
innobase/include/btr0cur.h:
Merge InnoDB-3.23.52b
innobase/include/buf0buf.h:
Merge InnoDB-3.23.52b
innobase/include/ha0ha.h:
Merge InnoDB-3.23.52b
innobase/include/ibuf0ibuf.h:
Merge InnoDB-3.23.52b
innobase/include/lock0lock.h:
Merge InnoDB-3.23.52b
innobase/include/log0log.h:
Merge InnoDB-3.23.52b
innobase/include/os0file.h:
Merge InnoDB-3.23.52b
innobase/include/rem0rec.ic:
Merge InnoDB-3.23.52b
innobase/include/srv0srv.h:
Merge InnoDB-3.23.52b
innobase/include/sync0arr.h:
Merge InnoDB-3.23.52b
innobase/include/sync0sync.h:
Merge InnoDB-3.23.52b
innobase/include/trx0trx.h:
Merge InnoDB-3.23.52b
innobase/lock/lock0lock.c:
Merge InnoDB-3.23.52b
innobase/log/log0log.c:
Merge InnoDB-3.23.52b
innobase/os/os0file.c:
Merge InnoDB-3.23.52b
innobase/row/row0mysql.c:
Merge InnoDB-3.23.52b
innobase/row/row0umod.c:
Merge InnoDB-3.23.52b
innobase/row/row0upd.c:
Merge InnoDB-3.23.52b
innobase/srv/srv0srv.c:
Merge InnoDB-3.23.52b
innobase/srv/srv0start.c:
Merge InnoDB-3.23.52b
innobase/sync/sync0arr.c:
Merge InnoDB-3.23.52b
innobase/sync/sync0sync.c:
Merge InnoDB-3.23.52b
innobase/trx/trx0trx.c:
Merge InnoDB-3.23.52b
sql/ha_innobase.h:
Merge InnoDB-3.23.52b
sql/ha_innobase.cc:
Merge InnoDB-3.23.52b
sql/sql_lex.h:
Merge InnoDB-3.23.52b
sql/mysqld.cc:
Merge InnoDB-3.23.52b
sql/sql_parse.cc:
Merge InnoDB-3.23.52b
sql/sql_yacc.yy:
Merge InnoDB-3.23.52b
Diffstat (limited to 'innobase/btr/btr0btr.c')
| -rw-r--r-- | innobase/btr/btr0btr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/innobase/btr/btr0btr.c b/innobase/btr/btr0btr.c index 88472d6dbe0..15642e6ccbc 100644 --- a/innobase/btr/btr0btr.c +++ b/innobase/btr/btr0btr.c @@ -2076,8 +2076,7 @@ btr_discard_page( btr_search_drop_page_hash_index(page); - if ((left_page_no == FIL_NULL) - && (btr_page_get_level(page, mtr) > 0)) { + if (left_page_no == FIL_NULL && btr_page_get_level(page, mtr) > 0) { /* We have to mark the leftmost node pointer on the right side page as the predefined minimum record */ |