diff options
| author | MySQL Build Team <build@mysql.com> | 2009-11-17 14:35:05 +0100 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2009-11-17 14:35:05 +0100 |
| commit | bf1f32b75a41fa3be9495abe33db9bb1bcf51d02 (patch) | |
| tree | a14ebfaa32a483373a751156a024d80aa7f0e531 | |
| parent | 36bbad94e407580ede96e3664bd749c46c416181 (diff) | |
| download | mariadb-git-bf1f32b75a41fa3be9495abe33db9bb1bcf51d02.tar.gz | |
Type change: "fk->name" is no "const char *" any more, rather a "LEX_STRING".
To access its string part, the ".str" element must be accessed.
This change was missing in "storage/ibmdb2i/db2i_constraints.cc", add it now.
| -rw-r--r-- | storage/ibmdb2i/db2i_constraints.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/ibmdb2i/db2i_constraints.cc b/storage/ibmdb2i/db2i_constraints.cc index 9a96eda1173..50af6c27898 100644 --- a/storage/ibmdb2i/db2i_constraints.cc +++ b/storage/ibmdb2i/db2i_constraints.cc @@ -102,7 +102,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex, Foreign_key* fk = (Foreign_key*)curKey; char db2LibName[MAX_DB2_SCHEMANAME_LENGTH+1]; - if (fk->name) + if (fk->name.str) { char db2FKName[MAX_DB2_FILENAME_LENGTH+1]; appendHere.append(STRING_WITH_LEN("CONSTRAINT ")); @@ -120,7 +120,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex, appendHere.append('.'); - convertMySQLNameToDB2Name(fk->name, db2FKName, sizeof(db2FKName)); + convertMySQLNameToDB2Name(fk->name.str, db2FKName, sizeof(db2FKName)); appendHere.append(db2FKName); } @@ -139,7 +139,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex, } firstTime = false; - convertMySQLNameToDB2Name(curColumn->field_name, colName, sizeof(colName)); + convertMySQLNameToDB2Name(curColumn->field_name.str, colName, sizeof(colName)); appendHere.append(colName); // DB2 requires that the sort sequence on the child table match the parent table's @@ -148,7 +148,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex, Field** field = fields; do { - if (strcmp((*field)->field_name, curColumn->field_name) == 0) + if (strcmp((*field)->field_name, curColumn->field_name.str) == 0) { int rc = updateAssociatedSortSequence((*field)->charset(), fileSortSequenceType, @@ -199,7 +199,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex, } firstTime = false; - convertMySQLNameToDB2Name(curRef->field_name, colName, sizeof(colName)); + convertMySQLNameToDB2Name(curRef->field_name.str, colName, sizeof(colName)); appendHere.append(colName); } |