• unknown's avatar
    Manual merge · 7e6f37f3
    unknown authored
    
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sp_head.cc:
      Auto merged
    sql/sp_head.h:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_trigger.h:
      Auto merged
    7e6f37f3
sp_head.h 22.4 KB