summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index dbae7977d62..c872d3cb241 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -144,8 +144,8 @@ void
st_select_lex_unit::init_prepare_fake_select_lex(THD *thd_arg)
{
thd_arg->lex->current_select= fake_select_lex;
- fake_select_lex->table_list.link_in_list((byte *)&result_table_list,
- (byte **)
+ fake_select_lex->table_list.link_in_list((uchar *)&result_table_list,
+ (uchar **)
&result_table_list.next_local);
fake_select_lex->context.table_list=
fake_select_lex->context.first_name_resolution_table=
@@ -162,7 +162,7 @@ st_select_lex_unit::init_prepare_fake_select_lex(THD *thd_arg)
order=order->next)
{
(*order->item)->walk(&Item::change_context_processor, 0,
- (byte*) &fake_select_lex->context);
+ (uchar*) &fake_select_lex->context);
}
}