• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9aa15040
    unknown authored
    into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
    
    
    mysql-test/r/sp-error.result:
      Auto merged
    mysql-test/t/sp-error.test:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/sp.h:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/share/errmsg.txt:
      Manual merge.
    sql/sp.cc:
      Manual merge.
    9aa15040
sp.h 3.15 KB