• unknown's avatar
    Manual merge. · 408d7752
    unknown authored
    
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_list.h:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    408d7752
ps.result 47.2 KB