diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-28 08:51:03 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-28 08:51:03 +0200 |
| commit | 88b405c4e21162b73077e000a9b8f7ffe9d6d251 (patch) | |
| tree | cfcd7ea8160cf2c79be8d73ccca32445e830770a /innobase/btr/btr0cur.c | |
| parent | 84f81dc593e8e21cbfb4596aef375d45e3a26ba8 (diff) | |
| parent | 72455300841e1b00c312c3a03ace3bcbd57a4d2f (diff) | |
| download | mariadb-git-88b405c4e21162b73077e000a9b8f7ffe9d6d251.tar.gz | |
Merge with 3.23.56 (Replace manual with 'empty' document)
Fix for bug when using auto_increment column and LAST_INSERT_ID()
Makefile.am:
Auto merged
ltconfig:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
sql/Makefile.am:
Auto merged
Docs/Makefile.am:
Merge with 3.23.56
Docs/manual.texi:
Merge with 3.23.56 (Replace manual with 'empty' document)
libmysql/libmysql.c:
Use local version
sql/log.cc:
Fix for bug when using auto_increment column and LAST_INSERT_ID()
sql/sql_base.cc:
Use local version
Diffstat (limited to 'innobase/btr/btr0cur.c')
| -rw-r--r-- | innobase/btr/btr0cur.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c index df24689a422..e61dcf4ecee 100644 --- a/innobase/btr/btr0cur.c +++ b/innobase/btr/btr0cur.c @@ -604,11 +604,11 @@ btr_cur_open_at_index_side( page_cur_set_after_last(page, page_cursor); } - if (estimate) { - btr_cur_add_path_info(cursor, height, root_height); - } - if (height == 0) { + if (estimate) { + btr_cur_add_path_info(cursor, height, + root_height); + } break; } @@ -621,6 +621,10 @@ btr_cur_open_at_index_side( page_cur_move_to_prev(page_cursor); } + if (estimate) { + btr_cur_add_path_info(cursor, height, root_height); + } + height--; node_ptr = page_cur_get_rec(page_cursor); |