• unknown's avatar
    Manual merge of 5.0-runtime to 5.1-runtime · 40ea2b48
    unknown authored
    
    mysql-test/r/sp-error.result:
      Manual merge
    mysql-test/r/sp.result:
      Manual merge
    mysql-test/r/udf.result:
      Manual merge
    mysql-test/t/sp.test:
      Manual merge
    mysql-test/t/udf.test:
      Manual merge
    sql/item_create.cc:
      Manual merge
    sql/sp_head.cc:
      Manual merge
    sql/sql_yacc.yy:
      Manual merge
    40ea2b48
sp.result 164 KB