diff options
| author | pem@mysql.com <> | 2003-10-22 16:10:22 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-10-22 16:10:22 +0200 |
| commit | 337238b78ac9f131b3082f987c812216e6247dad (patch) | |
| tree | 162a59c221392dfbcde183e7fdd33da1159e8bd9 /sql/ha_innodb.cc | |
| parent | 2918e5d529502f0c10c720f1360ab39d6d83bb48 (diff) | |
| parent | 70ea50366231ac471a894ab4e91f2322cdacb796 (diff) | |
| download | mariadb-git-337238b78ac9f131b3082f987c812216e6247dad.tar.gz | |
Merging 4.1->5.0
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 7f8c99f7c15..c10eec73274 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2253,8 +2253,8 @@ ha_innobase::write_row( skip_auto_inc_decr = FALSE; if (error == DB_DUPLICATE_KEY - && (user_thd->lex.sql_command == SQLCOM_REPLACE - || user_thd->lex.sql_command + && (user_thd->lex->sql_command == SQLCOM_REPLACE + || user_thd->lex->sql_command == SQLCOM_REPLACE_SELECT)) { skip_auto_inc_decr= TRUE; |