• unknown's avatar
    Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2d48a1f2
    unknown authored
    into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new
    
    
    sql/handler.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/share/errmsg.txt:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    mysql-test/r/sp.result:
      manual merge
    mysql-test/t/sp.test:
      manual merge
    storage/csv/ha_tina.cc:
      manual merge
    storage/myisam/ha_myisam.cc:
      manual merge
    2d48a1f2
sp.cc 53.9 KB