summaryrefslogtreecommitdiff
path: root/sql/opt_range.h
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2004-08-11 16:40:46 +0400
committerunknown <sergefp@mysql.com>2004-08-11 16:40:46 +0400
commitdde591f2039b31122cc7b43639b4a91f1f06e186 (patch)
tree89ed2e388870b8e566d9b9247202751b7cea2a2b /sql/opt_range.h
parent4aa20acc875be5ba6cb051f750f9599a80febd19 (diff)
downloadmariadb-git-dde591f2039b31122cc7b43639b4a91f1f06e186.tar.gz
Fix and testcase for BUG#4984
The crash is eliminated but still it is weird/inefficent that ROR-intersection is used when performing updates in empty table. mysql-test/r/index_merge_ror_cpk.result: Fix and testcase for BUG#4984 mysql-test/t/index_merge_ror_cpk.test: Fix and testcase for BUG#4984 sql/opt_range.cc: Don't call index_end() for CPK quick select inside of a ROR-intersection. sql/opt_range.h: Fix and testcase for BUG#4984
Diffstat (limited to 'sql/opt_range.h')
-rw-r--r--sql/opt_range.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 8826705c9a7..974ed409a87 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -236,6 +236,7 @@ protected:
bool free_file;
protected:
+ friend class TRP_ROR_INTERSECT;
friend
QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table,
struct st_table_ref *ref);