diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-01-28 15:11:18 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-01-28 16:51:46 +0530 |
| commit | f45448a92619a7e10fb3a6e3ce7b493d975741c2 (patch) | |
| tree | 5700f4104a5e410aeb731485768ca45b02662c7e | |
| parent | 4e82aaab2f65268e3f206db38c3f10de555f0496 (diff) | |
| download | mariadb-git-bb-10.0-sachin.tar.gz | |
MDEV-4774 Fix BuildBot failure on x86 vmsbb-10.0-sachin
Previous patch for this mdev broke the BuildBot for x86 vms. This patch
addresses this issue.
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_max_binlog_stmt_cache_size.result | 37 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_max_binlog_stmt_cache_size.test | 26 |
2 files changed, 21 insertions, 42 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_max_binlog_stmt_cache_size.result b/mysql-test/suite/binlog/r/binlog_max_binlog_stmt_cache_size.result index cf4d7004195..15c3c04b287 100644 --- a/mysql-test/suite/binlog/r/binlog_max_binlog_stmt_cache_size.result +++ b/mysql-test/suite/binlog/r/binlog_max_binlog_stmt_cache_size.result @@ -1,31 +1,14 @@ +call mtr.add_suppression("unsigned value 18446744073709547520 adjusted to 4294963200"); select @@max_binlog_stmt_cache_size; @@max_binlog_stmt_cache_size -18446744073709547520 -set global max_binlog_stmt_cache_size= 18446744073709547520; +max_binlog_stmt_cache_size +SET @cache_size= @@max_binlog_stmt_cache_size; +set global max_binlog_stmt_cache_size= @cache_size+1; select @@max_binlog_stmt_cache_size; @@max_binlog_stmt_cache_size -18446744073709547520 -set global max_binlog_stmt_cache_size= 18446744073709547519; -Warnings: -Warning 1292 Truncated incorrect max_binlog_stmt_cache_size value: '18446744073709547519' -select @@max_binlog_stmt_cache_size; -@@max_binlog_stmt_cache_size -18446744073709543424 -set global max_binlog_stmt_cache_size= 18446744073709551615; -Warnings: -Warning 1292 Truncated incorrect max_binlog_stmt_cache_size value: '18446744073709551615' -select @@max_binlog_stmt_cache_size; -@@max_binlog_stmt_cache_size -18446744073709547520 -set global max_binlog_stmt_cache_size= 18446744073709551614; -Warnings: -Warning 1292 Truncated incorrect max_binlog_stmt_cache_size value: '18446744073709551614' -select @@max_binlog_stmt_cache_size; -@@max_binlog_stmt_cache_size -18446744073709547520 -set global max_binlog_stmt_cache_size= 18446744073709551616; -ERROR 42000: Incorrect argument type to variable 'max_binlog_stmt_cache_size' -select @@max_binlog_stmt_cache_size; -@@max_binlog_stmt_cache_size -18446744073709547520 -set global max_binlog_stmt_cache_size= 18446744073709547520; +max_binlog_stmt_cache_size +set global max_binlog_stmt_cache_size= @cache_size-1; +select @@max_binlog_stmt_cache_size = @cache_size-4096; +@@max_binlog_stmt_cache_size = @cache_size-4096 +1 +set @@global.max_binlog_stmt_cache_size= @cache_size; diff --git a/mysql-test/suite/binlog/t/binlog_max_binlog_stmt_cache_size.test b/mysql-test/suite/binlog/t/binlog_max_binlog_stmt_cache_size.test index f85eed3cea8..d755f605095 100644 --- a/mysql-test/suite/binlog/t/binlog_max_binlog_stmt_cache_size.test +++ b/mysql-test/suite/binlog/t/binlog_max_binlog_stmt_cache_size.test @@ -1,22 +1,18 @@ source include/have_log_bin.inc; +#in case of 32 bit +call mtr.add_suppression("unsigned value 18446744073709547520 adjusted to 4294963200"); +--replace_result 18446744073709547520 max_binlog_stmt_cache_size 4294963200 max_binlog_stmt_cache_size select @@max_binlog_stmt_cache_size; ---let $cache_size=`select @@max_binlog_stmt_cache_size;` +--replace_result 18446744073709547520 max_binlog_stmt_cache_size 4294963200 max_binlog_stmt_cache_size +--disable_warnings +SET @cache_size= @@max_binlog_stmt_cache_size; -set global max_binlog_stmt_cache_size= 18446744073709547520; +set global max_binlog_stmt_cache_size= @cache_size+1; +--replace_result 18446744073709547520 max_binlog_stmt_cache_size 4294963200 max_binlog_stmt_cache_size select @@max_binlog_stmt_cache_size; -set global max_binlog_stmt_cache_size= 18446744073709547519; -select @@max_binlog_stmt_cache_size; - -set global max_binlog_stmt_cache_size= 18446744073709551615; -select @@max_binlog_stmt_cache_size; - -set global max_binlog_stmt_cache_size= 18446744073709551614; -select @@max_binlog_stmt_cache_size; - ---error ER_WRONG_TYPE_FOR_VAR -set global max_binlog_stmt_cache_size= 18446744073709551616; -select @@max_binlog_stmt_cache_size; +set global max_binlog_stmt_cache_size= @cache_size-1; +select @@max_binlog_stmt_cache_size = @cache_size-4096; ---eval set global max_binlog_stmt_cache_size= $cache_size +set @@global.max_binlog_stmt_cache_size= @cache_size; |