Commit ea7921f6 authored by unknown's avatar unknown

Small adjustment after merging fix for bug#23651 "Server crashes when

trigger which uses stored function invoked from different connections"
into 5.1.


sql/item_func.cc:
  After merge fix. Starting from 5.1 TABLE_SHARE for dummy TABLE object
  is also allocated in Item_func_sp constructor, so we use TABLE::alias
  instead of TABLE::s to check that dummy TABLE was not initialized yet
  or requires re-initialization.
parent 458fb082
...@@ -4852,7 +4852,7 @@ Item_func_sp::cleanup() ...@@ -4852,7 +4852,7 @@ Item_func_sp::cleanup()
result_field= NULL; result_field= NULL;
} }
m_sp= NULL; m_sp= NULL;
dummy_table->s= NULL; dummy_table->alias= NULL;
Item_func::cleanup(); Item_func::cleanup();
} }
......
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