diff options
| author | brian@zim.(none) <> | 2005-06-01 21:56:30 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2005-06-01 21:56:30 -0700 |
| commit | 113a99626d3debba5b5c7c574f20734ae8c025de (patch) | |
| tree | 21533890f530ab28e8f4542b5f7ca2deada7e9da /sql/opt_range.h | |
| parent | b884660a8366ce689efe3f6f135afb753a499fe7 (diff) | |
| parent | efb5ed5bab9699731c47894a6a1e805a303f6b37 (diff) | |
| download | mariadb-git-113a99626d3debba5b5c7c574f20734ae8c025de.tar.gz | |
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
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 8d365262334..b639ba6efa7 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -691,7 +691,7 @@ class SQL_SELECT :public Sql_alloc { ~SQL_SELECT(); void cleanup(); bool check_quick(THD *thd, bool force_quick_range, ha_rows limit) - { return test_quick_select(thd, key_map(~0), 0, limit, force_quick_range) < 0; } + { return test_quick_select(thd, key_map(~(uint)0), 0, limit, force_quick_range) < 0; } inline bool skip_record() { return cond ? cond->val_int() == 0 : 0; } int test_quick_select(THD *thd, key_map keys, table_map prev_tables, ha_rows limit, bool force_quick_range=0); |