database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
This commit is contained in:
jani@a88-113-38-195.elisa-laajakaista.fi
2007-05-24 13:24:36 +03:00
parent 2ff938d21c 088e2395f1
commit fc3b3a0a86
478 changed files with 8584 additions and 8306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_union.cc
View File

@@ -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);
}
}