• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8103db27
    unknown authored
    into  mysql.com:/home/dlenev/src/mysql-5.0-is
    
    
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/t/information_schema.test:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sp.h:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    mysql-test/r/sp.result:
      Manual merge
    mysql-test/t/sp.test:
      Manual merge
    sql/sql_class.h:
      Manual merge
    8103db27
sql_prepare.cc 69 KB