• unknown's avatar
    Merge polly.local:/tmp/maint/bug25137/my50-bug25137 · 96753a29
    unknown authored
    into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
    
    
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/t/innodb.test:
      Auto merged
    mysql-test/t/mysql.test:
      Auto merged
    mysql-test/t/mysqlbinlog.test:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    mysql-test/r/mysqlbinlog.result:
      SCCS merged
    96753a29
mysql.test 12.2 KB