diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-18 14:11:55 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-18 14:11:55 +0400 |
| commit | 30e7d6709f7fb0f70a07c80a1a06614ca23da5f4 (patch) | |
| tree | 9ba11fd32d82ac5c1364a537532ac896c4dd2058 /sql/sql_db.cc | |
| parent | 75aabd03d57f85d63d57b25a239b4f930a3ae3c0 (diff) | |
| parent | 3bc094d32a360b7d51600cf11bc4ce24117ecb78 (diff) | |
| download | mariadb-git-30e7d6709f7fb0f70a07c80a1a06614ca23da5f4.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index f91b92b1d4f..7860fa6d550 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -1006,7 +1006,7 @@ update_binlog: These DDL methods and logging are protected with the exclusive metadata lock on the schema. */ - if (write_to_binlog(thd, query, query_pos -1 - query, db, db_len)) + if (write_to_binlog(thd, query, (uint)(query_pos -1 - query), db, db_len)) { error= true; goto exit; @@ -1024,7 +1024,7 @@ update_binlog: These DDL methods and logging are protected with the exclusive metadata lock on the schema. */ - if (write_to_binlog(thd, query, query_pos -1 - query, db, db_len)) + if (write_to_binlog(thd, query, (uint)(query_pos -1 - query), db, db_len)) { error= true; goto exit; |