• Vasil Dimov's avatar
    Fix the failing innodb.innodb test: · acf187a2
    Vasil Dimov authored
      innodb.innodb                            [ fail ]
              Test ended at 2010-06-02 15:04:06
      
      CURRENT_TEST: innodb.innodb
      --- /usr/w/mysql-trunk-innodb/mysql-test/suite/innodb/r/innodb.result	2010-05-23 23:10:26.576407000 +0300
      +++ /usr/w/mysql-trunk-innodb/mysql-test/suite/innodb/r/innodb.reject	2010-06-02 15:04:05.000000000 +0300
      @@ -2648,7 +2648,7 @@
       create table t4 (s1 char(2) binary,primary key (s1)) engine=innodb;
       insert into t1 values (0x41),(0x4120),(0x4100);
       insert into t2 values (0x41),(0x4120),(0x4100);
      -ERROR 23000: Duplicate entry 'A\x00' for key 'PRIMARY'
      +ERROR 23000: Duplicate entry 'A' for key 'PRIMARY'
       insert into t2 values (0x41),(0x4120);
    
    The change in the printout was introduced in:
    
      ------------------------------------------------------------
      revno: 3008.6.2
      revision-id: sergey.glukhov@sun.com-20100527160143-57nas8nplzpj26dz
      parent: sergey.glukhov@sun.com-20100527155443-24vqi9o8rpnkyci7
      committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
      branch nick: mysql-trunk-bugfixing
      timestamp: Thu 2010-05-27 20:01:43 +0400
      message:
        Bug#52430 Incorrect key in the error message for duplicate key error involving BINARY type
        For BINARY(N) strip trailing zeroes to make the error message nice-looking
      
       @ mysql-test/r/errors.result
          test case
      
       @ mysql-test/r/type_binary.result
          result fix
      
       @ mysql-test/t/errors.test
          test case
      
       @ sql/key.cc
          For BINARY(N) strip trailing zeroes to make the error message nice-looking
    
    and its author (Sergey) did not notice the test failure because that test
    has been disabled in his tree.
    acf187a2
innodb.result 94.7 KB