diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-03-20 15:21:22 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-03-20 15:21:22 +0400 |
| commit | 4359c6b4806605c78987e50cab3a6b42016b7603 (patch) | |
| tree | 0e76b37395bd09dbdb31568c9635d9bb6777b758 /sql/sql_load.cc | |
| parent | e263530bea641e610a2cb6dac20da369272551b1 (diff) | |
| download | mariadb-git-4359c6b4806605c78987e50cab3a6b42016b7603.tar.gz | |
A cleanup for MDEV-15597: fixing compilation failure on 32-bit Windows
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index cb062361651..cfa92f170ab 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1349,7 +1349,8 @@ READ_INFO::READ_INFO(THD *thd, File file_par, set_if_bigger(length,line_start.length()); stack= stack_pos= (int*) thd->alloc(sizeof(int) * length); - if (data.reserve(m_fixed_length)) + DBUG_ASSERT(m_fixed_length < UINT_MAX32); + if (data.reserve((size_t) m_fixed_length)) error=1; /* purecov: inspected */ else { |