• unknown's avatar
    Merge recycle.(none):/src/bug23491/my50-bug23491 · 1edf3685
    unknown authored
    into  recycle.(none):/src/bug23491/my51-bug23491
    
    
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/r/sp-code.result:
      Auto merged
    mysql-test/r/udf.result:
      Auto merged
    mysql-test/t/mysqldump.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sp_head.h:
      Auto merged
    mysql-test/r/mysqldump.result:
      Manual Merge.
    sql/sql_yacc.yy:
      Manual Merge.
    1edf3685
sp.cc 55.3 KB