diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-05-04 15:23:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-05-04 15:23:26 +0200 |
| commit | 87e3e67f434628768b5125fbab7e8862fa60da1a (patch) | |
| tree | df19b8bcac9988d83270ed1da05f765bfc4e8624 /sql/handler.h | |
| parent | 80da57cc4f0c717ee3e01ac5abccc859b88a2fbf (diff) | |
| parent | cee9ab9d85a8d75290b0d60bc7af26c8cf179a1d (diff) | |
| download | mariadb-git-87e3e67f434628768b5125fbab7e8862fa60da1a.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sql/handler.h b/sql/handler.h index 34b7b147d58..4f30ec6d7ec 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1,8 +1,8 @@ #ifndef HANDLER_INCLUDED #define HANDLER_INCLUDED /* - Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2009, 2014, Monty Program Ab. + Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2009, 2016, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -406,7 +406,9 @@ static const uint MYSQL_START_TRANS_OPT_READ_WRITE = 4; /* Flags for method is_fatal_error */ #define HA_CHECK_DUP_KEY 1 #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 { @@ -1929,7 +1931,10 @@ public: // Virtual columns changed static const HA_ALTER_FLAGS ALTER_COLUMN_VCOL = 1L << 30; - // ALTER TABLE for a partitioned table + /** + ALTER TABLE for a partitioned table. The engine needs to commit + online alter of all partitions atomically (using group_commit_ctx) + */ static const HA_ALTER_FLAGS ALTER_PARTITIONED = 1L << 31; /** @@ -2934,7 +2939,10 @@ public: ((flags & HA_CHECK_DUP_KEY) && (error == HA_ERR_FOUND_DUPP_KEY || error == HA_ERR_FOUND_DUPP_UNIQUE)) || - error == HA_ERR_AUTOINC_ERANGE) + error == HA_ERR_AUTOINC_ERANGE || + ((flags & HA_CHECK_FK_ERROR) && + (error == HA_ERR_ROW_IS_REFERENCED || + error == HA_ERR_NO_REFERENCED_ROW))) return FALSE; return TRUE; } @@ -4269,4 +4277,4 @@ inline const char *table_case_name(HA_CREATE_INFO *info, const char *name) void print_keydup_error(TABLE *table, KEY *key, const char *msg, myf errflag); void print_keydup_error(TABLE *table, KEY *key, myf errflag); -#endif +#endif /* HANDLER_INCLUDED */ |