mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
Merge mysql-5.1-innodb to mysql-5.5-innodb.
This commit is contained in:
commit
cd4c9520fc
2 changed files with 4 additions and 2 deletions
|
@ -86,7 +86,8 @@ row_ins_index_entry(
|
|||
dict_index_t* index, /*!< in: index */
|
||||
dtuple_t* entry, /*!< in/out: index entry to insert */
|
||||
ulint n_ext, /*!< in: number of externally stored columns */
|
||||
ibool foreign,/*!< in: TRUE=check foreign key constraints */
|
||||
ibool foreign,/*!< in: TRUE=check foreign key constraints
|
||||
(foreign=FALSE only during CREATE INDEX) */
|
||||
que_thr_t* thr); /*!< in: query thread */
|
||||
/***********************************************************//**
|
||||
Inserts a row to a table. This is a high-level function used in
|
||||
|
|
|
@ -2152,7 +2152,8 @@ row_ins_index_entry(
|
|||
dict_index_t* index, /*!< in: index */
|
||||
dtuple_t* entry, /*!< in/out: index entry to insert */
|
||||
ulint n_ext, /*!< in: number of externally stored columns */
|
||||
ibool foreign,/*!< in: TRUE=check foreign key constraints */
|
||||
ibool foreign,/*!< in: TRUE=check foreign key constraints
|
||||
(foreign=FALSE only during CREATE INDEX) */
|
||||
que_thr_t* thr) /*!< in: query thread */
|
||||
{
|
||||
ulint err;
|
||||
|
|
Loading…
Reference in a new issue