Commit a95646be authored by unknown's avatar unknown
Browse files

WL 2826: Error handling of ALTER TABLE for partitioning 

Final fixes


dbug/dbug_long.h:
  Removed patch from dbug_long.h (file not in use anymore)
sql/mysql_priv.h:
  Removed error_inject_code variable
parent 0da06937

dbug/dbug_long.h

+0 −13
Original line number Diff line number Diff line
@@ -127,11 +127,6 @@ 
#    define DBUG_SETJMP setjmp

#    define DBUG_LONGJMP longjmp

#    define DBUG_DUMP(keyword,a1)

#    define DBUG_EXECUTE_IF(keyword, a1)

#    define DBUG_EXECUTE_COND(keyword, a1) 0

#    define DBUG_COND(keyword) 0

#    define DBUG_ADD_KEYWORD(key)

#    define DBUG_DEL_KEYWORD(key)

# else

#    define DBUG_ENTER(a) \

	auto char *_db_func_; auto char *_db_file_; auto int _db_level_; \
@@ -162,12 +157,4 @@ 
#    define DBUG_SETJMP(a1) (_db_setjmp_ (), setjmp (a1))

#    define DBUG_LONGJMP(a1,a2) (_db_longjmp_ (), longjmp (a1, a2))

#    define DBUG_DUMP(keyword,a1,a2) _db_dump_(__LINE__,keyword,a1,a2)

#    define DBUG_EXECUTE_IF(keyword,a1) \

        {if (_db_on_) {if (_db_strict_keyword_ (keyword)) { a1 }}}

#    define DBUG_EXECUTE_COND(keyword, a1) \

        (_db_on_ ? ((_db_strict_keyword_ (keyword)) ? ((a1), 0) : 0) : 0)

#    define DBUG_COND(keyword) \

        ((_db_on_ && _db_strict_keyword_ (keyword)) ? 1 : 0)

#    define DBUG_ADD_KEYWORD(key) _db_add_strict_keyword_(key)

#    define DBUG_DEL_KEYWORD(key) _db_del_strict_keyword_(key)

# endif

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ extern ulong delayed_insert_limit, delayed_queue_size; 
extern ulong delayed_insert_threads, delayed_insert_writes;

extern ulong delayed_rows_in_use,delayed_insert_errors;

#ifdef ERROR_INJECT_SUPPORT

extern ulong error_inject_code, error_inject_value;

extern ulong error_inject_value;

#endif

extern ulong slave_open_temp_tables;

extern ulong query_cache_size, query_cache_min_res_unit;