diff options
author | Monty <monty@mariadb.org> | 2017-01-04 18:45:23 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2017-01-11 09:19:45 +0200 |
commit | de22cd3fe5caa1db8839701e45f379b3b5be7328 (patch) | |
tree | adb36eba9aa7e72c8f34d1317ea94fad03ecb996 /sql/table.cc | |
parent | bf95970ec03e353f297c3b809219cee91ac40724 (diff) | |
download | mariadb-git-de22cd3fe5caa1db8839701e45f379b3b5be7328.tar.gz |
Fixes for failures in test scripts and removal of some compiler warnings
- rpl_gtid_stop_start: Random failure
- sysvars_innodb,32bit: Fixes for 32 bit
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index b7f83a502b7..41f764d1e59 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2410,8 +2410,9 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, } } } - DBUG_ASSERT((table_check_constraints - share->check_constraints) == - share->table_check_constraints - share->field_check_constraints); + DBUG_ASSERT((uint) (table_check_constraints - share->check_constraints) == + (uint) (share->table_check_constraints - + share->field_check_constraints)); if (options) { |