diff options
| author | unknown <brian@zim.(none)> | 2005-06-01 18:48:29 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-06-01 18:48:29 -0700 |
| commit | e2bf6b04a6d97a6680cd4deb653fc92e6604bfea (patch) | |
| tree | 6a69ff42d381e6dc38ff3518c762a6fdb7a8bb0c /sql/sql_select.cc | |
| parent | e71ef9416f84922310f88c1cd7295334dadfeb68 (diff) | |
| parent | 0218ecf7af9bb7dee577ec01f42f602205ec3483 (diff) | |
| download | mariadb-git-e2bf6b04a6d97a6680cd4deb653fc92e6604bfea.tar.gz | |
Merge
sql/ha_heap.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_example.cc:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_repl.cc:
SCCS merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1d42fe49283..9661c0c13c9 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -36,7 +36,7 @@ const char *join_type_str[]={ "UNKNOWN","system","const","eq_ref","ref", }; const key_map key_map_empty(0); -const key_map key_map_full(~0); +const key_map key_map_full(~(uint)0); static void optimize_keyuse(JOIN *join, DYNAMIC_ARRAY *keyuse_array); static bool make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds, @@ -3452,7 +3452,7 @@ make_simple_join(JOIN *join,TABLE *tmp_table) join_tab->select_cond=0; join_tab->quick=0; join_tab->type= JT_ALL; /* Map through all records */ - join_tab->keys.init(~0); /* test everything in quick */ + join_tab->keys.init(~(uint)0); /* test everything in quick */ join_tab->info=0; join_tab->on_expr=0; join_tab->ref.key = -1; |