summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-11-28 15:55:43 +0200
committerunknown <monty@mysql.com>2003-11-28 15:55:43 +0200
commit6cb23b94ccbcf8ddafeb88f8de028d1086803faa (patch)
tree93fd46c73f839b74713646337e22a966326fae92 /sql
parentaa780843961c3f60028d62da7728bdb907b1f6ee (diff)
parent15763ed5aa4ef6ef19f2f21a73f9b0b0100553db (diff)
downloadmariadb-git-6cb23b94ccbcf8ddafeb88f8de028d1086803faa.tar.gz
merge with 4.0 to get fix for range bug
libmysql/libmysql.c: Auto merged sql/opt_range.cc: Auto merged
Diffstat (limited to 'sql')
-rw-r--r--sql/opt_range.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index e2761832e65..bbdc1913a8c 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -68,7 +68,7 @@ public:
{}
inline bool is_same(SEL_ARG *arg)
{
- if (type != arg->type)
+ if (type != arg->type || part != arg->part)
return 0;
if (type != KEY_RANGE)
return 1;