• unknown's avatar
    Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 346ea19b
    unknown authored
    into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
    
    
    mysql-test/r/sp-prelocking.result:
      Auto merged
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/innodb.test:
      Auto merged
    mysql-test/t/sp-prelocking.test:
      Auto merged
    mysql-test/t/trigger.test:
      Auto merged
    sql/sql_class.h:
      Auto merged
    mysql-test/r/create.result:
      Use local.
    mysql-test/r/innodb.result:
      Manual merge.
    346ea19b
trigger.result 60.5 KB