• Marko Mäkelä's avatar
    Merge from mysql-5.1-innodb: · 2a3db4b9
    Marko Mäkelä authored
    Post-merge fixes: Remove the MYSQL_VERSION_ID checks, because they only
    apply to the InnoDB Plugin. Fix potential race condition accessing
    trx->op_info and trx->detailed_error.
    ------------------------------------------------------------
    revno: 3466
    revision-id: marko.makela@oracle.com-20100514130815-ym7j7cfu88ro6km4
    parent: marko.makela@oracle.com-20100514130228-n3n42nw7ht78k0wn
    committer: Marko Mäkelä <marko.makela@oracle.com>
    branch nick: mysql-5.1-innodb2
    timestamp: Fri 2010-05-14 16:08:15 +0300
    message:
      Make the InnoDB FOREIGN KEY parser understand multi-statements. (Bug #48024)
      Also make InnoDB thinks that /*/ only starts a comment. (Bug #53644).
    
      This fixes the bugs in the InnoDB Plugin.
    
      ha_innodb.h: Use trx_query_string() instead of trx_query() when
      available (MySQL 5.1.42 or later).
    
      innobase_get_stmt(): New function, to retrieve the currently running
      SQL statement.
    
      struct trx_struct: Remove mysql_query_str. Use innobase_get_stmt() instead.
    
      dict_strip_comments(): Add and observe the parameter sql_length. Treat
      /*/ as the start of a comment.
    
      dict_create_foreign_constraints(), row_table_add_foreign_constraints():
      Add the parameter sql_length.
    2a3db4b9
innodb_bug48024.result 592 Bytes