diff options
Diffstat (limited to 'sql/sql_profile.cc')
| -rw-r--r-- | sql/sql_profile.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc index 0fdb069ffc7..90c19920951 100644 --- a/sql/sql_profile.cc +++ b/sql/sql_profile.cc @@ -29,11 +29,10 @@ - "profiling_history_size", integer, session + global, "Num queries stored?" */ - +#include <my_global.h> #include "sql_priv.h" -#include "unireg.h" // REQUIRED: for other includes #include "sql_profile.h" -#include "my_sys.h" +#include <my_sys.h> #include "sql_show.h" // schema_table_store_record #include "sql_class.h" // THD @@ -288,7 +287,7 @@ void QUERY_PROFILE::set_query_source(char *query_source_arg, uint query_length_arg) { /* Truncate to avoid DoS attacks. */ - uint length= min(MAX_QUERY_LENGTH, query_length_arg); + uint length= MY_MIN(MAX_QUERY_LENGTH, query_length_arg); DBUG_ASSERT(query_source == NULL); /* we don't leak memory */ if (query_source_arg != NULL) |