Commit 722d19c3 authored by unknown's avatar unknown

Fixed another compiler error on HP-UX.

parent 2eb70647
...@@ -537,6 +537,7 @@ sp_head::restore_lex(THD *thd) ...@@ -537,6 +537,7 @@ sp_head::restore_lex(THD *thd)
DBUG_ENTER("sp_head::restore_lex"); DBUG_ENTER("sp_head::restore_lex");
LEX *sublex= thd->lex; LEX *sublex= thd->lex;
LEX *oldlex= (LEX *)m_lex.pop(); LEX *oldlex= (LEX *)m_lex.pop();
SELECT_LEX *sl;
if (! oldlex) if (! oldlex)
return; // Nothing to restore return; // Nothing to restore
...@@ -544,7 +545,7 @@ sp_head::restore_lex(THD *thd) ...@@ -544,7 +545,7 @@ sp_head::restore_lex(THD *thd)
// Update some state in the old one first // Update some state in the old one first
oldlex->ptr= sublex->ptr; oldlex->ptr= sublex->ptr;
oldlex->next_state= sublex->next_state; oldlex->next_state= sublex->next_state;
for (SELECT_LEX *sl= sublex->all_selects_list ; for (sl= sublex->all_selects_list ;
sl ; sl ;
sl= sl->next_select_in_list()) sl= sl->next_select_in_list())
{ {
...@@ -584,7 +585,7 @@ sp_head::restore_lex(THD *thd) ...@@ -584,7 +585,7 @@ sp_head::restore_lex(THD *thd)
// QQ ...or just open tables in thd->open_tables? // QQ ...or just open tables in thd->open_tables?
// This is not entirerly clear at the moment, but for now, we collect // This is not entirerly clear at the moment, but for now, we collect
// tables here. // tables here.
for (SELECT_LEX *sl= sublex.all_selects_list ; for (sl= sublex.all_selects_list ;
sl ; sl ;
sl= sl->next_select()) sl= sl->next_select())
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment