• unknown's avatar
    Merge · 6b5b3f3a
    unknown authored
    
    mysql-test/r/sp-error.result:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/share/errmsg.txt:
      SCCS merged
    6b5b3f3a
sp-error.result 32.9 KB