diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:10:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:10:03 +0300 |
| commit | 61b2618d3aae78950f1b8dbe8d4482573c77875d (patch) | |
| tree | 599d620008cc156658b21b3d3b6403398afabbe3 /sql/lock.cc | |
| parent | ac2db256d9a390269a891a2addccf8ae1453cdb2 (diff) | |
| parent | 6ca35c14286d7649ff3938fd54fcf9c9bee6e136 (diff) | |
| download | mariadb-git-61b2618d3aae78950f1b8dbe8d4482573c77875d.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index a34613fb7fe..83a0896808f 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -827,7 +827,7 @@ MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count, uint flags) we may allocate too much, but better safe than memory overrun. And in the FLUSH case, the memory is released quickly anyway. */ - sql_lock->lock_count= locks - locks_buf; + sql_lock->lock_count= (uint)(locks - locks_buf); DBUG_ASSERT(sql_lock->lock_count <= lock_count); DBUG_PRINT("info", ("sql_lock->table_count %d sql_lock->lock_count %d", sql_lock->table_count, sql_lock->lock_count)); |