summaryrefslogtreecommitdiff
path: root/sql/lock.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-10-03 19:43:43 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2017-10-03 19:43:43 +0000
commit8d413c32dc50469d65185d6252014ef29b7b42c2 (patch)
tree707b0d82b49713267be24e9a1aafb4c6e8acdb18 /sql/lock.cc
parent4732767981442cf2522088471ba211ecf9f542a2 (diff)
downloadmariadb-git-8d413c32dc50469d65185d6252014ef29b7b42c2.tar.gz
Fix several truncation and formatting warnings.
Diffstat (limited to 'sql/lock.cc')
-rw-r--r--sql/lock.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc
index 06cb00fe32d..79ce27b9937 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -824,7 +824,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));