Skip to content

M
MariaDB
Commit 79cd2f5e authored by Monty's avatar Monty
Browse files
Options

Added type conversion to fix compilation error on windows

parent e133aa1e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/sql_type.h
View file @ 79cd2f5e
...@@ -171,7 +171,7 @@ template<uint sz> ...@@ -171,7 +171,7 @@ template<uint sz>
class TypelibBuffer: public Typelib class TypelibBuffer: public Typelib
{ {
const char *m_type_names[sz + 1]; const char *m_type_names[sz + 1];
unsigned int m_type_lengths[sz + 1]; uint m_type_lengths[sz + 1];
public: public:
TypelibBuffer(uint count, const LEX_CSTRING *values) TypelibBuffer(uint count, const LEX_CSTRING *values)
:Typelib(count, m_type_names, m_type_lengths) :Typelib(count, m_type_names, m_type_lengths)
...@@ -181,7 +181,7 @@ class TypelibBuffer: public Typelib ...@@ -181,7 +181,7 @@ class TypelibBuffer: public Typelib
{ {
DBUG_ASSERT(values[i].str != NULL); DBUG_ASSERT(values[i].str != NULL);
m_type_names[i]= values[i].str; m_type_names[i]= values[i].str;
m_type_lengths[i]= values[i].length; m_type_lengths[i]= (uint) values[i].length;
} }
m_type_names[sz]= NullS; // End marker m_type_names[sz]= NullS; // End marker
m_type_lengths[sz]= 0; // End marker m_type_lengths[sz]= 0; // End marker
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7