• marko's avatar
    Make our 5.1 tree an exact copy of the MySQL source tree. · 5f8a93a6
    marko authored
    Revert r2116:
    ------------------------------------------------------------------------
    r2116 | vasil | 2007-11-23 19:10:17 +0200 (pe, 23 marras 2007) | 6 lines
    
    Set trx->mysql_query_str to NULL at transaction commit.
    It could be a problem if someone looks at it after that because MySQL may
    have free()d it then.
    
    Approved by:    Heikki (via IM)
    ------------------------------------------------------------------------
    
    innodb.test, innodb.result:
    Remove some tests that were apparently accidentally removed in
    ChangeSet@1.2598.2.6  2007-11-06 15:42:58-07:00  tsmith@hindu.god
    Apply snapshot innodb-5.1-ss1989
    
    ha_innodb.cc: Remove a decorative comment.
    
    This tree should be an exact match of the following MySQL source tree:
    
    bk://mysql.bkbits.net/mysql-5.1
    ROOTKEY=3985cf0cwNRCED_XNSCA7RvkLPer2Q
    TIPKEY=47447c7cTrSPx22mH8PXNmurrycaaw
    
    bkf changes | head
    
    ChangeSet@1.2634.1.2, 2007-11-21 19:42:50+01:00, df@pippilotta.erinye.com +1 -0
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      MERGE: 1.1810.3425.2
    
    ChangeSet@1.1810.3425.2, 2007-11-21 19:41:13+01:00, df@pippilotta.erinye.com +1 -0
      add wrong warning to suppression file
    
    ChangeSet@1.2634.1.1, 2007-11-21 19:33:27+01:00, df@pippilotta.erinye.com +1 -0
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      MERGE: 1.1810.3425.1
    
    ChangeSet@1.1810.3425.1, 2007-11-21 18:11:08+01:00, df@pippilotta.erinye.com +1 -0
      ignore readline warnings
    
    ChangeSet@1.2635, 2007-11-21 15:06:38+01:00, mleich@five.local.lan +6 -0
      Merge five.local.lan:/work/merge/mysql-5.0-build-30418
      into  five.local.lan:/work/merge/mysql-5.1-build-31610
      MERGE: 1.1810.3284.72
    5f8a93a6
ha_innodb.cc 232 KB