diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-11-17 20:03:33 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2023-01-09 18:06:06 +0100 |
| commit | df82d68421699f5d51df15f0e5c1a6aa78bced63 (patch) | |
| tree | aa27410c2420de0b1f8a2c313de70af41b91f588 | |
| parent | 1e6ad0ce13c5d2e4125df8006316d9dfe0f8d649 (diff) | |
| download | mariadb-git-df82d68421699f5d51df15f0e5c1a6aa78bced63.tar.gz | |
cleanup
remove casts. uchar can store 1/0 as good as bool.
| -rw-r--r-- | sql/item.cc | 6 | ||||
| -rw-r--r-- | sql/sql_select.cc | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/sql/item.cc b/sql/item.cc index 8af83f3a7f1..a543664fdc1 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -7225,7 +7225,7 @@ bool Item_null::send(Protocol *protocol, st_value *buffer) bool Item::cache_const_expr_analyzer(uchar **arg) { - bool *cache_flag= (bool*)*arg; + uchar *cache_flag= *arg; if (!*cache_flag) { Item *item= real_item(); @@ -7264,9 +7264,9 @@ bool Item::cache_const_expr_analyzer(uchar **arg) Item* Item::cache_const_expr_transformer(THD *thd, uchar *arg) { - if (*(bool*)arg) + if (*arg) { - *((bool*)arg)= FALSE; + *arg= FALSE; Item_cache *cache= get_cache(thd); if (!cache) return NULL; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index d5519e9f541..d9922fddb8f 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -28287,20 +28287,20 @@ JOIN::reoptimize(Item *added_where, table_map join_tables, void JOIN::cache_const_exprs() { - bool cache_flag= FALSE; - bool *analyzer_arg= &cache_flag; + uchar cache_flag= FALSE; + uchar *analyzer_arg= &cache_flag; /* No need in cache if all tables are constant. */ if (const_tables == table_count) return; if (conds) - conds->compile(thd, &Item::cache_const_expr_analyzer, (uchar **)&analyzer_arg, - &Item::cache_const_expr_transformer, (uchar *)&cache_flag); + conds->compile(thd, &Item::cache_const_expr_analyzer, &analyzer_arg, + &Item::cache_const_expr_transformer, &cache_flag); cache_flag= FALSE; if (having) - having->compile(thd, &Item::cache_const_expr_analyzer, (uchar **)&analyzer_arg, - &Item::cache_const_expr_transformer, (uchar *)&cache_flag); + having->compile(thd, &Item::cache_const_expr_analyzer, + &analyzer_arg, &Item::cache_const_expr_transformer, &cache_flag); for (JOIN_TAB *tab= first_depth_first_tab(this); tab; tab= next_depth_first_tab(this, tab)) @@ -28309,9 +28309,7 @@ void JOIN::cache_const_exprs() { cache_flag= FALSE; (*tab->on_expr_ref)->compile(thd, &Item::cache_const_expr_analyzer, - (uchar **)&analyzer_arg, - &Item::cache_const_expr_transformer, - (uchar *)&cache_flag); + &analyzer_arg, &Item::cache_const_expr_transformer, &cache_flag); } } } |