database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

WL 2826: Error handling of ALTER TABLE for partitioning

Browse Source 
Moved error inject from being flags to compiler to being part of config.h
Also error inject only defined if debug is also defined
+Small fixes
This commit is contained in:
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
2006-04-19 12:05:44 -04:00
parent 8ae26a2868
commit 22ed19e434
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
configure.in
View File

@ -1588,18 +1588,6 @@ then
DEBUG_OPTIMIZE_CXX="" DEBUG_OPTIMIZE_CXX=""
fi fi
# If we should allow error injection tests
AC_ARG_WITH(error-inject,
[ --with-error-inject Enable error injection in MySQL Server],
[ with_error_inject=$withval ],
[ with_error_inject=no ])
if test "$with_error_inject" = "yes"
then
CFLAGS="-DERROR_INJECT_SUPPORT $CFLAGS"
CXXFLAGS="-DERROR_INJECT_SUPPORT $CXXFLAGS"
fi
AC_ARG_WITH(debug, AC_ARG_WITH(debug,
[ --with-debug Add debug code [ --with-debug Add debug code
--with-debug=full Add debug code (adds memory checker, very slow)], --with-debug=full Add debug code (adds memory checker, very slow)],
@ -1621,6 +1609,21 @@ else
CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS" CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
fi fi
# If we should allow error injection tests
AC_ARG_WITH(error-inject,
[ --with-error-inject Enable error injection in MySQL Server],
[ with_error_inject=$withval ],
[ with_error_inject=no ])
if test $with_debug != "no"
then
if test "$with_error_inject" = "yes"
then
AC_DEFINE([ERROR_INJECT_SUPPORT], [1],
[Enable error injection in MySQL Server])
fi
fi
AC_ARG_WITH([fast-mutexes], AC_ARG_WITH([fast-mutexes],
AC_HELP_STRING([--with-fast-mutexes], AC_HELP_STRING([--with-fast-mutexes],
[Compile with fast mutexes (default is disabled)]), [Compile with fast mutexes (default is disabled)]),

12
sql/handler.h
View File

@ -1378,11 +1378,13 @@ public:
virtual void drop_table(const char *name); virtual void drop_table(const char *name);
virtual int create(const char *name, TABLE *form, HA_CREATE_INFO *info)=0; virtual int create(const char *name, TABLE *form, HA_CREATE_INFO *info)=0;
#define CHF_DELETE_FLAG 1
#define CHF_RENAME_FLAG 2
virtual int create_handler_files(const char *name, const char *old_name, virtual int create_handler_files(const char *name, const char *old_name,
bool rename_flag) int action_flag)
{ { return FALSE; }
return FALSE;
}
virtual int change_partitions(HA_CREATE_INFO *create_info, virtual int change_partitions(HA_CREATE_INFO *create_info,
const char *path, const char *path,
@ -1390,7 +1392,7 @@ public:
ulonglong *deleted, ulonglong *deleted,
const void *pack_frm_data, const void *pack_frm_data,
uint pack_frm_len) uint pack_frm_len)
{ print_error(HA_ERR_WRONG_COMMAND, MYF(0)); return TRUE; } { return HA_ERR_WRONG_COMMAND; }
virtual int drop_partitions(const char *path) virtual int drop_partitions(const char *path)
{ return HA_ERR_WRONG_COMMAND; } { return HA_ERR_WRONG_COMMAND; }
virtual int rename_partitions(const char *path) virtual int rename_partitions(const char *path)