diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-15 19:11:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-15 19:11:28 +0200 |
| commit | 4ef25dbfd87824ade87998193af378e54274c038 (patch) | |
| tree | a43697dc08f4b81feee14fbfe02cbf821141d807 /sql/mdl.h | |
| parent | 3d798be1d481835b60a811148a10ea14c37d5674 (diff) | |
| parent | e2e740030d4f027e25f9a322990af0fdb3e0ffc3 (diff) | |
| download | mariadb-git-4ef25dbfd87824ade87998193af378e54274c038.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/mdl.h')
| -rw-r--r-- | sql/mdl.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/mdl.h b/sql/mdl.h index f30c976ac94..be9cc806ec2 100644 --- a/sql/mdl.h +++ b/sql/mdl.h @@ -21,8 +21,6 @@ #include <mysql_com.h> #include <lf.h> -#include <algorithm> - class THD; class MDL_context; @@ -373,8 +371,7 @@ public: character set is utf-8, we can safely assume that no character starts with a zero byte. */ - using std::min; - return memcmp(m_ptr, rhs->m_ptr, min(m_length, rhs->m_length)); + return memcmp(m_ptr, rhs->m_ptr, MY_MIN(m_length, rhs->m_length)); } MDL_key(const MDL_key *rhs) |