diff options
| author | unknown <miguel@hegel.txg> | 2004-07-16 03:47:17 -0300 |
|---|---|---|
| committer | unknown <miguel@hegel.txg> | 2004-07-16 03:47:17 -0300 |
| commit | 45cbab28f6363fe1cfa8228c22703d470c0f90f4 (patch) | |
| tree | 279b9132a13ef3b7f72e2526cf48d4bfabc88c59 /sql/opt_range.cc | |
| parent | acdf855008a69cee6b2a9bce198d89a69c038073 (diff) | |
| download | mariadb-git-45cbab28f6363fe1cfa8228c22703d470c0f90f4.tar.gz | |
Fixes for bug #4571 (Windows compabilities)
sql/opt_range.cc:
Fix for unreferenced local variable, cast and indirection to different types
sql/sp_head.cc:
Fix for unreferenced variables and cast
sql/sql_acl.cc:
Fix for unreferenced variable
sql/sql_db.cc:
Fix for unreferenced variable and cast
sql/sql_insert.cc:
Fix for cast and redifinition of variable declared i (VC++ bug)
sql/sql_parse.cc:
Fix for cast
sql/sql_update.cc:
Fix for cast
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index a144570a405..7f98462cf84 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1882,7 +1882,6 @@ TABLE_READ_PLAN *get_best_disjunct_quick(PARAM *param, SEL_IMERGE *imerge, double blocks_in_index_read; ha_rows roru_total_records; double roru_intersect_part= 1.0; - double sweep_cost; DBUG_ENTER("get_best_disjunct_quick"); DBUG_PRINT("info", ("Full table scan cost =%g", read_time)); @@ -2449,7 +2448,7 @@ bool ror_intersect_add(const PARAM *param, ROR_INTERSECT_INFO *info, DBUG_PRINT("info", ("Adding scan on %s", info->param->table->key_info[ror_scan->keynr].name)); SEL_ARG *tuple_arg= NULL; - char *key_ptr= key_val; + char *key_ptr= (char*) key_val; bool cur_covered, prev_covered= bitmap_is_set(&info->covered_fields, key_part->fieldnr); @@ -2481,7 +2480,7 @@ bool ror_intersect_add(const PARAM *param, ROR_INTERSECT_INFO *info, } } ha_rows records; - min_range.length= max_range.length= key_ptr - key_val; + min_range.length= max_range.length= ((char*) key_ptr - (char*) key_val); records= param->table->file-> records_in_range(ror_scan->keynr, &min_range, |