mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
BUG#17138: Crashes in stored procedure
Last round of review fixes BUILD/compile-pentium-gcov: No change sql/ha_ndbcluster.h: Last round of review changes sql/ha_partition.h: Last round of review changes sql/handler.h: Last round of review changes sql/item_sum.cc: Last round of review changes sql/sql_acl.cc: Last round of review changes sql/sql_insert.cc: Last round of review changes sql/sql_select.cc: Last round of review changes sql/sql_table.cc: Last round of review changes sql/sql_union.cc: Last round of review changes sql/sql_update.cc: Last round of review changes
This commit is contained in:
@@ -235,6 +235,11 @@
|
||||
/* Options of START TRANSACTION statement (and later of SET TRANSACTION stmt) */
|
||||
#define MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT 1
|
||||
|
||||
/* Flags for method is_fatal_error */
|
||||
#define HA_CHECK_DUP_KEY 1
|
||||
#define HA_CHECK_DUP_UNIQUE 2
|
||||
#define HA_CHECK_DUP (HA_CHECK_DUP_KEY + HA_CHECK_DUP_UNIQUE)
|
||||
|
||||
enum legacy_db_type
|
||||
{
|
||||
DB_TYPE_UNKNOWN=0,DB_TYPE_DIAB_ISAM=1,
|
||||
@@ -972,17 +977,14 @@ public:
|
||||
ignorable than others. E.g. the partition handler can get inserts
|
||||
into a range where there is no partition and this is an ignorable
|
||||
error.
|
||||
HA_ERR_FOUND_DUPP_UNIQUE is a special case in MyISAM that means the
|
||||
same thing as HA_ERR_FOUND_DUPP_KEY but can in some cases lead to
|
||||
HA_ERR_FOUND_DUP_UNIQUE is a special case in MyISAM that means the
|
||||
same thing as HA_ERR_FOUND_DUP_KEY but can in some cases lead to
|
||||
a slightly different error message.
|
||||
*/
|
||||
#define HA_CHECK_DUPP_KEY 1
|
||||
#define HA_CHECK_DUPP_UNIQUE 2
|
||||
#define HA_CHECK_DUPP (HA_CHECK_DUPP_KEY + HA_CHECK_DUPP_UNIQUE)
|
||||
virtual bool is_fatal_error(int error, uint flags)
|
||||
{
|
||||
if (!error ||
|
||||
((flags & HA_CHECK_DUPP_KEY) &&
|
||||
((flags & HA_CHECK_DUP_KEY) &&
|
||||
(error == HA_ERR_FOUND_DUPP_KEY ||
|
||||
error == HA_ERR_FOUND_DUPP_UNIQUE)))
|
||||
return FALSE;
|
||||
|
Reference in New Issue
Block a user