Commit bf5cc31d authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: cosmetic changes

parent 65405308
...@@ -1504,7 +1504,7 @@ int Item::save_in_field_no_warnings(Field *field, bool no_conversions) ...@@ -1504,7 +1504,7 @@ int Item::save_in_field_no_warnings(Field *field, bool no_conversions)
#ifndef DBUG_OFF #ifndef DBUG_OFF
static inline static inline
void mark_unsupported_func(const char *where, const char *processor_name) void dbug_mark_unsupported_func(const char *where, const char *processor_name)
{ {
char buff[64]; char buff[64];
my_snprintf(buff, sizeof(buff), "%s::%s", where ? where: "", processor_name); my_snprintf(buff, sizeof(buff), "%s::%s", where ? where: "", processor_name);
...@@ -1514,7 +1514,7 @@ void mark_unsupported_func(const char *where, const char *processor_name) ...@@ -1514,7 +1514,7 @@ void mark_unsupported_func(const char *where, const char *processor_name)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
#else #else
#define mark_unsupported_func(X,Y) {} #define dbug_mark_unsupported_func(X,Y) {}
#endif #endif
bool mark_unsupported_function(const char *where, void *store, uint result) bool mark_unsupported_function(const char *where, void *store, uint result)
...@@ -1522,7 +1522,7 @@ bool mark_unsupported_function(const char *where, void *store, uint result) ...@@ -1522,7 +1522,7 @@ bool mark_unsupported_function(const char *where, void *store, uint result)
Item::vcol_func_processor_result *res= Item::vcol_func_processor_result *res=
(Item::vcol_func_processor_result*) store; (Item::vcol_func_processor_result*) store;
uint old_errors= res->errors; uint old_errors= res->errors;
mark_unsupported_func(where, "check_vcol_func_processor"); dbug_mark_unsupported_func(where, "check_vcol_func_processor");
res->errors|= result; /* Store type of expression */ res->errors|= result; /* Store type of expression */
/* Store the name to the highest violation (normally VCOL_IMPOSSIBLE) */ /* Store the name to the highest violation (normally VCOL_IMPOSSIBLE) */
if (result > old_errors) if (result > old_errors)
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment