diff options
author | unknown <kostja@bodhi.(none)> | 2008-05-18 01:51:18 +0400 |
---|---|---|
committer | unknown <kostja@bodhi.(none)> | 2008-05-18 01:51:18 +0400 |
commit | 1cf0b5cb892569de4e07252e578542aa8f691039 (patch) | |
tree | 31e6f0685e8b284f4281aff2fb0f2220836e22ab /include | |
parent | 954787376f0943c14f64f48eb43520ed10f9b3d7 (diff) | |
download | mariadb-git-1cf0b5cb892569de4e07252e578542aa8f691039.tar.gz |
Implement some code review fixes for the fix for Bug#27430
"Crash in subquery code when in PS and table DDL changed after PREPARE"
include/my_sys.h:
Add two new flags for my_error(). These flags help parameterize
behavoiur of my_message_sql()
sql/item.cc:
Update comments.
Fix a typo in Item_param::set_param_type_and_swap_value()
sql/mysqld.cc:
Implement two additional flags for my_error():
- if ME_NO_SP_HANDLER is specified, ignore stored procedure continue/
exit handlers
- if ME_NO_WARNING_FOR_ERROR is specified, do not push warning
sql/sql_base.cc:
Update comments.
Rename a few methods.
sql/sql_class.h:
Update and improve comments.
sql/sql_prepare.cc:
Update comments.
Style changes.
sql/table.h:
Update comments.
Style changes.
Rename a few methods.
tests/mysql_client_test.c:
Zero the bind array, to follow C API requirements.
Diffstat (limited to 'include')
-rw-r--r-- | include/my_sys.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index eccb61f5b29..09c768cadb7 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -90,6 +90,9 @@ extern int NEAR my_errno; /* Last error in mysys */ #define ME_COLOUR1 ((1 << ME_HIGHBYTE)) /* Possibly error-colours */ #define ME_COLOUR2 ((2 << ME_HIGHBYTE)) #define ME_COLOUR3 ((3 << ME_HIGHBYTE)) +#define ME_FATALERROR 1024 /* Fatal statement error */ +#define ME_NO_WARNING_FOR_ERROR 2048 /* Don't push a warning for error */ +#define ME_NO_SP_HANDLER 4096 /* Don't call stored routine error handlers */ /* Bits in last argument to fn_format */ #define MY_REPLACE_DIR 1 /* replace dir in name with 'dir' */ |