diff options
| author | unknown <monty@mysql.com> | 2004-10-22 18:44:51 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-22 18:44:51 +0300 |
| commit | bc6652db9b1f5f302648c3a920fb1fa25449a6d8 (patch) | |
| tree | 6faefd7a2f197f4031ef94eb74fc71f8f2936185 /myisam/rt_index.c | |
| parent | cfcca61a177eecacdc2c525c1ba4fea082b1b1c4 (diff) | |
| download | mariadb-git-bc6652db9b1f5f302648c3a920fb1fa25449a6d8.tar.gz | |
Fix compiler warnings (detected by Intel's C++ compiler)
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
client/mysql.cc:
Fix compiler warnings
client/mysqltest.c:
Fix wrong counting of lines
Remove compiler warnings
heap/hp_hash.c:
Fix compiler warnings
innobase/dict/dict0load.c:
Fix compiler warnings
innobase/include/mem0mem.h:
Fix compiler warnings
libmysql/client_settings.h:
Fix compiler warnings
myisam/ft_nlq_search.c:
Add comments about compiler warnings
myisam/rt_index.c:
Add comments about compiler warnings
myisam/rt_mbr.c:
Add comments about compiler warnings
mysql-test/r/ps.result:
Test case for bug#6094
mysql-test/t/ps.test:
Test case for bug#6094
mysys/hash.c:
Fix compiler warnings
mysys/my_handler.c:
Add comments about compiler warnings
mysys/my_thr_init.c:
Add comments about compiler warnings
ndb/include/mgmapi/mgmapi.h:
Fix compiler warnings
regex/main.c:
Fix compiler warnings
sql/item.h:
Fix compiler warnings
sql/item_func.h:
Add comments about compiler warnings
sql/spatial.h:
Add comments about compiler warnings
sql/sql_lex.h:
Fix compiler warning
sql/sql_list.h:
Fix compiler warning
sql/sql_parse.cc:
Move testing of access rights of tables in CREATE ... SELECT to create_table_precheck() to fix privilege checking in CREATE ... SELECT
(Bug #6094)
sql/sql_prepare.cc:
Remove not needed empty line
sql/sql_string.h:
Fix compiler warnings
strings/ctype-mb.c:
Fix compiler warnings
Diffstat (limited to 'myisam/rt_index.c')
| -rw-r--r-- | myisam/rt_index.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/myisam/rt_index.c b/myisam/rt_index.c index 4fffd848624..cfb2ca877f4 100644 --- a/myisam/rt_index.c +++ b/myisam/rt_index.c @@ -494,9 +494,11 @@ static uchar *rtree_pick_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key, for (; k < last; k = rt_PAGE_NEXT_KEY(k, key_length, nod_flag)) { + /* The following is safe as -1.0 is an exact number */ if ((increase = rtree_area_increase(keyinfo->seg, k, key, key_length, - &area)) == -1) + &area)) == -1.0) return NULL; + /* The following should be safe, even if we compare doubles */ if (increase < best_incr) { best_key = k; @@ -505,6 +507,7 @@ static uchar *rtree_pick_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key, } else { + /* The following should be safe, even if we compare doubles */ if ((increase == best_incr) && (area < best_area)) { best_key = k; @@ -1021,6 +1024,7 @@ ha_rows rtree_estimate(MI_INFO *info, uint keynr, uchar *key, { double k_area = rtree_rect_volume(keyinfo->seg, k, key_length); + /* The following should be safe, even if we compare doubles */ if (k_area == 0) { if (flag & (MBR_CONTAIN | MBR_INTERSECT)) |