« back to all changes in this revision
Viewing changes to plugin/innobase/row/row0mysql.c
- Committer: Stewart Smith
- Date: 2010-11-09 08:06:36 UTC
- mto: (2021.1.2 build) (1953.1.1 build) (1819.7.43 update-innobase)
- mto: This revision was merged to the branch mainline in revision 1924.
- Revision ID: stewart@flamingspork.com-20101109080636-do37ttb7y1zb4k5a
Merge Revision revid:marko.makela@oracle.com-20100514130815-ym7j7cfu88ro6km4 from MySQL InnoDB
Original revid:marko.makela@oracle.com-20100514130815-ym7j7cfu88ro6km4
Original Authors: Marko Mkel <marko.makela@oracle.com>
Original commit 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.
Original revid:marko.makela@oracle.com-20100514130815-ym7j7cfu88ro6km4
Original Authors: Marko Mkel <marko.makela@oracle.com>
Original commit 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.
- files modified:
- plugin/innobase/dict/dict0dict.c
added
removed
plugin/innobase/row/row0mysql.c
