diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 18:27:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 18:27:23 +0200 |
| commit | 24ac546d0f16d5f56b11c068e4f187a9c4c56bd0 (patch) | |
| tree | 0ce4470aa683f8109963f71760f23a6711ec05ab /sql/handler.h | |
| parent | 9e826bfa36a57f10540ca6ea649cb450add48cf4 (diff) | |
| download | mariadb-git-24ac546d0f16d5f56b11c068e4f187a9c4c56bd0.tar.gz | |
use consistent error messaging for IGNORE
1. the same message text for INSERT and INSERT IGNORE
2. no new warnings in UPDATE IGNORE yet (big change for 5.5)
and replace a commonly used expression with a
named constant
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index 11718ba775c..3d6c8dea2bf 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -335,6 +335,7 @@ #define HA_CHECK_DUP_UNIQUE 2 #define HA_CHECK_FK_ERROR 4 #define HA_CHECK_DUP (HA_CHECK_DUP_KEY + HA_CHECK_DUP_UNIQUE) +#define HA_CHECK_ALL (~0U) enum legacy_db_type { @@ -3110,6 +3111,4 @@ inline const char *table_case_name(HA_CREATE_INFO *info, const char *name) return ((lower_case_table_names == 2 && info->alias) ? info->alias : name); } -void warn_fk_constraint_violation(THD *thd, TABLE *table, int error); - #endif /* HANDLER_INCLUDED */ |