diff options
| author | unknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-20 21:50:44 -0500 |
|---|---|---|
| committer | unknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-20 21:50:44 -0500 |
| commit | 0da06937929761146d591097bb21f3c3656836d6 (patch) | |
| tree | d2c0e2f860c6c05247a07afa8979b5421550962c /sql | |
| parent | 1154609c39975dbba426224c6204e620c80dfa28 (diff) | |
| download | mariadb-git-0da06937929761146d591097bb21f3c3656836d6.tar.gz | |
WL 2826: Error handling of ALTER TABLE for partitioning
Merged error injects with dbug push
sql/mysql_priv.h:
Merged error injects with dbug push
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 0a229d5181b..202c04d0b1c 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -625,9 +625,12 @@ struct Query_cache_query_flags inline bool my_error_inject_name(const char *dbug_str) { - if (_db_on_ && _db_strict_keyword_ (dbug_str)) + const char *extra_str= "-d,"; + char total_str[200]; + if (_db_strict_keyword_ (dbug_str)) { - DBUG_DEL_KEYWORD(dbug_str); + strxmov(total_str, extra_str, dbug_str, NullS); + DBUG_SET(total_str); return 1; } return 0; @@ -647,7 +650,7 @@ my_error_inject(int value) } #define ERROR_INJECT_CRASH(code) \ - DBUG_EXECUTE_COND(code, abort()) + DBUG_EVALUATE_IF(code, (abort(), 0), 0) #define ERROR_INJECT_ACTION(code, action) \ (my_error_inject_name(code) ? ((action), 0) : 0) #define ERROR_INJECT(code) \ |