diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-05 15:07:31 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-05 15:07:31 +0300 |
| commit | 61e96be77fdc0eee96c86903b5b66f8edf6b9238 (patch) | |
| tree | 3d5a889ac13f04d4676f8dd9b2e9e5b2a8de9c5a /sql/sql_insert.cc | |
| parent | 75730fb37e4a730df1dca83da9c8ff63c7122491 (diff) | |
| download | mariadb-git-61e96be77fdc0eee96c86903b5b66f8edf6b9238.tar.gz | |
postmerge fix
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index d14cc1cf780..160d77b512e 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -567,7 +567,11 @@ static bool check_view_insertability(TABLE_LIST *view, ulong query_id) view->contain_auto_increment= 1; /* prepare unique test */ field->field->query_id= other_query_id; - *trans= field; // remove collation if we have it + /* + remove collation (or other transparent for update function) if we have + it + */ + trans->item= field; } /* unique test */ for (trans= trans_start; trans != trans_end; trans++) |