summaryrefslogtreecommitdiff
path: root/storage/federated
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2017-01-10 18:28:24 +0200
committerMonty <monty@mariadb.org>2017-01-11 09:19:45 +0200
commit5f0c31f928338e8a6ffde098b7ffd3d1a8b02903 (patch)
treeac246928fcfa0b9fe0c63a5511a3c74fef167f3c /storage/federated
parent177c191ff4b9c0033665a292fdb5907095ddb823 (diff)
downloadmariadb-git-5f0c31f928338e8a6ffde098b7ffd3d1a8b02903.tar.gz
MDEV-11597 Assertion when doing select from virtual column with impossible value
- Changed error handlers interface so that they can change error level in the handler - Give warnings and errors when calculating virtual columns - On insert/update error is fatal in strict mode. - SELECT and DELETE will only give a warning if a virtual field generates an error - Added VCOL_UPDATE_FOR_DELETE and VCOL_UPDATE_INDEX_FOR_REPLACE to be able to easily detect in update_virtual_fields() if we should use an error handler to mask errors or not.
Diffstat (limited to 'storage/federated')
-rw-r--r--storage/federated/ha_federated.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 038415cc188..879a17782aa 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -1653,7 +1653,7 @@ public:
public:
bool handle_condition(THD *thd, uint sql_errno, const char* sqlstate,
- Sql_condition::enum_warning_level level,
+ Sql_condition::enum_warning_level *level,
const char* msg, Sql_condition ** cond_hdl)
{
return sql_errno >= ER_ABORTING_CONNECTION &&