diff options
| author | Monty <monty@mariadb.org> | 2016-12-27 01:30:20 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-01-11 09:18:35 +0200 |
| commit | 1628a2ae27cfc8b96e4b50d85d430955625e2d88 (patch) | |
| tree | f830ac93d1ab02870da7398003a93bf30362160b /sql/item_jsonfunc.cc | |
| parent | 1afb17047a61d7666d4c3d6e5fae97ec526693ba (diff) | |
| download | mariadb-git-1628a2ae27cfc8b96e4b50d85d430955625e2d88.tar.gz | |
Fixed issues found by buildbot
- MDEV-11621 rpl.rpl_gtid_stop_start fails sporadically in buildbot
- MDEV-11620 rpl.rpl_upgrade_master_info fails sporadically in buildbot
The issue above was probably that the build machine was overworked and the
shutdown took longer than 30 resp 10 seconds, which caused MyISAM tables
to be marked as crashed.
Fixed by flushing myisam tables before doing a forced shutdown/kill.
I also increased timeout for forced shutdown from 10 seconds to 60 seconds
to fix other possible issues on slow machines.
Fixed also some compiler warnings
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index 9b9490a0cbc..a500170ead0 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -2307,7 +2307,7 @@ bool Item_func_json_search::fix_fields(THD *thd, Item **ref) } -static const uint SQR_MAX_BLOB_WIDTH= sqrt(MAX_BLOB_WIDTH); +static const uint SQR_MAX_BLOB_WIDTH= (uint) sqrt(MAX_BLOB_WIDTH); void Item_func_json_search::fix_length_and_dec() { |