• Vasil Dimov's avatar
    Merge from mysql-5.1-innodb: · 46b1ee73
    Vasil Dimov authored
      ------------------------------------------------------------
      revno: 3415
      revision-id: calvin.sun@oracle.com-20100422191614-2atswbilyyxep6rm
      parent: marko.makela@oracle.com-20100422093342-jf9ojlzdqsdebohn
      committer: Calvin Sun <calvin.sun@oracle.com>
      branch nick: mysql-5.1-innodb
      timestamp: Thu 2010-04-22 14:16:14 -0500
      message:
        mysql-5.1-innodb: add error codes to innodb_bug51920.test
        kill of active connection yields different error code
        depending on platform.
      modified:
        mysql-test/suite/innodb/r/innodb_bug51920.result 6918@cee13dc7-1704-0410-992b-c9b4543f1246:branches%2F5.1%2Fmysql-test%2Finnodb_bug51920.result
        mysql-test/suite/innodb/t/innodb_bug51920.test 6918@cee13dc7-1704-0410-992b-c9b4543f1246:branches%2F5.1%2Fmysql-test%2Finnodb_bug51920.test
        mysql-test/suite/innodb_plugin/r/innodb_bug51920.result 6919@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug51920.result
        mysql-test/suite/innodb_plugin/t/innodb_bug51920.test 6919@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug51920.test
      ------------------------------------------------------------
    46b1ee73
innodb_bug51920.result 316 Bytes