• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6658fb34
    unknown authored
    into  mysql.com:/home/dlenev/src/mysql-5.0-bg11896
    
    
    mysql-test/t/sp-error.test:
      Auto merged
    mysql-test/t/trigger.test:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    mysql-test/r/trigger.result:
      Manual merge.
    sql/share/errmsg.txt:
      Manual merge.
    6658fb34
errmsg.txt 321 KB