diff options
| author | unknown <miguel@hegel.local> | 2004-05-05 02:59:17 -0300 |
|---|---|---|
| committer | unknown <miguel@hegel.local> | 2004-05-05 02:59:17 -0300 |
| commit | bddee0c170454f54c1f87299d88d3aa9e44a3872 (patch) | |
| tree | acaa682ecb4e7413232120ad5965cc6adc2f410c /sql/opt_range.cc | |
| parent | af847c22af26e1cc308eeab08d35942741809408 (diff) | |
| download | mariadb-git-bddee0c170454f54c1f87299d88d3aa9e44a3872.tar.gz | |
Windows fixes for VC++ compiler compability
myisam/myisam_ftdump.c:
VC++ compiler compability fix
mysys/my_getsystime.c:
Applied Sergei's code for Windows (still subject to changes by him)
sql/handler.cc:
VC++ compiler compability fix
sql/item_geofunc.cc:
Removed non-used variable
sql/item_strfunc.cc:
VC++ compiler compability fix
sql/opt_range.cc:
VC++ compiler compability fix
sql/sql_insert.cc:
VC++ compiler compability fix
sql/sql_lex.cc:
VC++ compiler compability fix
sql/sql_parse.cc:
VC++ compiler compability fix
sql/sql_prepare.cc:
VC++ compiler compability fix
sql/sql_union.cc:
Removed non-used variable and VC++ compiler compability fix
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 3ef1323893f..1e7bf90738c 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2612,12 +2612,12 @@ int QUICK_SELECT::get_next() if (!(range= it++)) DBUG_RETURN(HA_ERR_END_OF_FILE); // All ranges used - start_key.key= range->min_key; + start_key.key= (const byte*) range->min_key; start_key.length= range->min_length; start_key.flag= ((range->flag & NEAR_MIN) ? HA_READ_AFTER_KEY : (range->flag & EQ_RANGE) ? HA_READ_KEY_EXACT : HA_READ_KEY_OR_NEXT); - end_key.key= range->max_key; + end_key.key= (const byte*) range->max_key; end_key.length= range->max_length; /* We use READ_AFTER_KEY here because if we are reading on a key |