mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/innodb+: Merge revisions 3575:3579 from branches/zip:

Browse source 
------------------------------------------------------------------------
  r3577 | vasil | 2008-12-17 14:58:26 +0200 (Wed, 17 Dec 2008) | 6 lines

  branches/zip:

  Remove 2 entries from the ChangeLog about changes not big enough.

  Discussed with: Marko
  ------------------------------------------------------------------------
  r3579 | marko | 2008-12-17 22:40:38 +0200 (Wed, 17 Dec 2008) | 3 lines

  branches/zip: row_sel_try_search_shortcut(), row_sel(): Adjust two
  debug assertions that should have been adjusted in r3575.
  ------------------------------------------------------------------------
This commit is contained in:
marko 2008-12-17 21:04:41 +00:00
parent 82cfb40dab
commit 5da5707b11
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -64,16 +64,6 @@
erratic. The fix is not to use srv_thread_concurrency when erratic. The fix is not to use srv_thread_concurrency when
exiting, instead use the flag trx->declared_to_be_inside_innodb. exiting, instead use the flag trx->declared_to_be_inside_innodb.
2008-12-09 The InnoDB Team
* trx/trx0undo.c:
Print 2 spaces between a timestamp and "InnoDB:" as usual.
2008-12-09 The InnoDB Team
* row/row0purge.c:
Allocate mtr_vers from the stack, not with mem_alloc().
2008-12-04 The InnoDB Team 2008-12-04 The InnoDB Team
* include/mysql_addons.h, handler/mysql_addons.cc, * include/mysql_addons.h, handler/mysql_addons.cc,

4
row/row0sel.c
View file

@ -1229,7 +1229,7 @@ row_sel_try_search_shortcut(
goto func_exit; goto func_exit;
} }
ut_ad(plan->pcur.latch_mode == node->latch_mode); ut_ad(plan->pcur.latch_mode == BTR_SEARCH_LEAF);
plan->n_rows_fetched++; plan->n_rows_fetched++;
ret = SEL_FOUND; ret = SEL_FOUND;
@ -1729,7 +1729,7 @@ skip_lock:
plan->n_rows_fetched++; plan->n_rows_fetched++;
ut_ad(plan->pcur.latch_mode == node->latch_mode); ut_ad(plan->pcur.latch_mode == BTR_SEARCH_LEAF);
if ((plan->n_rows_fetched <= SEL_PREFETCH_LIMIT) if ((plan->n_rows_fetched <= SEL_PREFETCH_LIMIT)
|| plan->unique_search || plan->no_prefetch || plan->unique_search || plan->no_prefetch