diff options
| author | monty@narttu.mysql.fi <> | 2007-01-27 03:46:45 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2007-01-27 03:46:45 +0200 |
| commit | 8a80e36ac3facdfba626fd758b6e4490d3ea9ddf (patch) | |
| tree | 7a54aa50f6bf549d049cd400fe056d244cfc7eb8 /sql/opt_range.h | |
| parent | c022454e7c5690330ed78664443e65b3511649b8 (diff) | |
| parent | 120e3f5ee1a5f2d62f6a4ff10db0797c5ac42287 (diff) | |
| download | mariadb-git-8a80e36ac3facdfba626fd758b6e4490d3ea9ddf.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
Diffstat (limited to 'sql/opt_range.h')
| -rw-r--r-- | sql/opt_range.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h index 525a0adcff7..d82e1dc459e 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -301,7 +301,7 @@ protected: DYNAMIC_ARRAY ranges; /* ordered array of range ptrs */ QUICK_RANGE **cur_range; /* current element in ranges */ - QUICK_RANGE *range; + QUICK_RANGE *last_range; KEY_PART *key_parts; KEY_PART_INFO *key_part_info; int cmp_next(QUICK_RANGE *range); |