1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure we print the most importaint violating function

Browse Source
This commit is contained in:
Monty 2016-06-08 10:34:37 +03:00 committed by Sergei Golubchik
parent 2fe8dd0f90
commit d99994a460
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/item.cc
View File

@ -1413,9 +1413,12 @@ bool mark_unsupported_function(const char *where, uchar *store, uint result)
{
Item::vcol_func_processor_result *res=
(Item::vcol_func_processor_result*) store;
uint old_errors= res->errors;
mark_unsupported_func(where, "check_vcol_func_processor");
res->errors|= result; /* Store type of expression */
res->name= where ? where : "";
/* Store the name to the highest violation (normally VCOL_IMPOSSIBLE) */
if (res->errors > old_errors)
res->name= where ? where : "";
return false;
}

8
sql/item.h
View File

@ -34,10 +34,10 @@ C_MODE_END
/* Bits for type of vcol expression */
#define VCOL_DETERMINISTIC 0 /* Normal (no bit set) */
#define VCOL_NON_DETERMINISTIC 1
#define VCOL_TIME_FUNC 2
#define VCOL_IMPOSSIBLE 4
#define VCOL_UNKNOWN 8 /* UDF used; Need fix_fields() to know */
#define VCOL_UNKNOWN 1 /* UDF used; Need fix_fields() to know */
#define VCOL_NON_DETERMINISTIC 2
#define VCOL_TIME_FUNC 4
#define VCOL_IMPOSSIBLE 8
class Protocol;
struct TABLE_LIST;