diff options
author | unknown <heikki@donna.mysql.fi> | 2001-06-08 18:03:24 +0300 |
---|---|---|
committer | unknown <heikki@donna.mysql.fi> | 2001-06-08 18:03:24 +0300 |
commit | 0f9b1363b3a0f8368b03d4320351924d9ef4ced2 (patch) | |
tree | 8aed4d179519da69803142356fc3d493e345fc63 | |
parent | 95015b0844abd39e6ce635eeda7f8fbb56b5da56 (diff) | |
download | mariadb-git-0f9b1363b3a0f8368b03d4320351924d9ef4ced2.tar.gz |
row0sel.c Fix a bug in consistent read through a secondary index
innobase/row/row0sel.c:
Fix a bug in consistent read through a secondary index
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
-rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
-rw-r--r-- | innobase/row/row0sel.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index fb534622f9b..139241f6b88 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1 +1,2 @@ jani@janikt.pp.saunalahti.fi +heikki@donna.mysql.fi diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index e3bab021669..5599bb42a25 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -2207,11 +2207,11 @@ row_sel_get_clust_rec_for_mysql( visit through secondary index records that would not really exist in our snapshot. */ - if ((old_vers || rec_get_deleted_flag(rec)) + if (clust_rec && (old_vers || rec_get_deleted_flag(rec)) && !row_sel_sec_rec_is_for_clust_rec(rec, sec_index, clust_rec, clust_index)) { clust_rec = NULL; - } + } } *out_rec = clust_rec; |