diff options
| author | Monty <monty@mariadb.org> | 2018-01-27 15:20:01 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-27 15:20:01 +0200 |
| commit | 84514ec643aafe74b7ac256fa485013e222f942e (patch) | |
| tree | 6f77ba0109d6764bd1fcae51dde8eec75e7ebc67 /storage/connect | |
| parent | 071f52839937bada46c53af23eb220e993c1e12d (diff) | |
| parent | 95f393394442437eea403d91c3c4bd68ec24fdf9 (diff) | |
| download | mariadb-git-84514ec643aafe74b7ac256fa485013e222f942e.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
sql/table.cc
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/odbconn.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp index 3b0cb562672..45662779b81 100644 --- a/storage/connect/odbconn.cpp +++ b/storage/connect/odbconn.cpp @@ -2250,10 +2250,10 @@ public: return (SQLCHAR *) (m_part[i].length ? m_part[i].str : NULL); } // end of ptr - size_t length(uint i) + SQLSMALLINT length(uint i) { DBUG_ASSERT(i < max_parts); - return m_part[i].length; + return (SQLSMALLINT)m_part[i].length; } // end of length }; // end of class SQLQualifiedName |