diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
| commit | 068c61978e3a81836d52b8caf11e044290159ad1 (patch) | |
| tree | 2cbca861ab2cebe3bd99379ca9668bb483ca0d2a /sql/sql_profile.cc | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'sql/sql_profile.cc')
| -rw-r--r-- | sql/sql_profile.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc index feb7810fa28..dc7aacb3d94 100644 --- a/sql/sql_profile.cc +++ b/sql/sql_profile.cc @@ -288,7 +288,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) |