• mmakela's avatar
    branches/innodb+: Merge revisions 6949:6970 from branches/zip, · 80f27ff3
    mmakela authored
    skipping the revisions that do not make sense in branches/innodb+:
      ------------------------------------------------------------------------
      r6957 | vdimov | 2010-04-06 22:05:54 +0300 (Tue, 06 Apr 2010) | 2 lines
      Changed paths:
         M /branches/zip/trx/trx0trx.c
    
      branches/zip: Whitespace fixup
      ------------------------------------------------------------------------
      r6962 | mmakela | 2010-04-07 15:03:54 +0300 (Wed, 07 Apr 2010) | 2 lines
      Changed paths:
         M /branches/zip/handler/ha_innodb.cc
    
      branches/zip: innobase_init(): Correct the error message
      about wrong innodb_change_buffering value.  Reported by Ranger.
      ------------------------------------------------------------------------
      r6967 | vdimov | 2010-04-07 22:40:38 +0300 (Wed, 07 Apr 2010) | 2 lines
      Changed paths:
         M /branches/zip/include/univ.i
    
      branches/zip: Whitespace fixup in univ.i
      ------------------------------------------------------------------------
    80f27ff3
univ.i 17 KB