• unknown's avatar
    Merge neptunus.(none):/home/msvensson/mysql/bug22436/my50-bug22436 · 15a86d18
    unknown authored
    into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
    
    
    mysql-test/r/innodb_mysql.result:
      Auto merged
    mysql-test/t/innodb_mysql.test:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    mysql-test/r/create.result:
      Merge
    mysql-test/t/create.test:
      Merge
    mysql-test/t/view.test:
      Remove the disable_warnings part as engine=innodb has been removed
    15a86d18
innodb_mysql.result 12.6 KB