sql/item.cc:
  After merge fixes (bug during merge)
sql/sql_show.cc:
  Ensure that lex->all_select_list is properly reset on function end
  (Caused crashes after merge)