• marko's avatar
    branches/zip: Merge revisions 5148:5233 from branches/5.1: · a4401ad0
    marko authored
      ------------------------------------------------------------------------
      r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines
    
      branches/5.1:
    
      Whitespace fixup.
      ------------------------------------------------------------------------
      r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines
    
      branches/5.1:
    
      Merge a change from MySQL (this fixes the failing innodb_mysql test):
    
        ------------------------------------------------------------
        revno: 1810.3894.10
        committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
        branch nick: mysql-5.0-bugteam
        timestamp: Tue 2009-05-19 11:32:21 +0500
        message:
          Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
          Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
          Suggested fix is to add '\'' symbol check for quotation condition
          (dict_strip_comments() function).
        modified:
          innobase/dict/dict0dict.c
          mysql-test/r/innodb_mysql.result
          mysql-test/t/innodb_mysql.test
      ------------------------------------------------------------------------
      r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
    
      branches/5.1: Merge the test case from r5232 from branches/5.0:
        ------------------------------------------------------------------------
        r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
    
        branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
        (Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
    
        Also, add a test case for Bug #40565.
    
        rb://128 approved by Heikki Tuuri
        ------------------------------------------------------------------------
      ------------------------------------------------------------------------
    a4401ad0
mtr0log.ic 6.96 KB