• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 24af7680
    unknown authored
    into  mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2
    
    
    mysql-test/r/sp-error.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    sql/sp_head.cc:
      Auto merged
    sql/sql_trigger.h:
      Auto merged
    sql/sp.cc:
      Manual merge.
    sql/sp.h:
      Manual merge.
    sql/sql_base.cc:
      Manual merge.
    24af7680
view.result 73.3 KB