[Commits] Rev 2848: Fix buildbot failure: minimum join_ buffer_size is different on different platforms in file:///home/psergey/dev2/maria-5.3-mwl128-dsmrr-cpk/

Sergey Petrunya psergey at askmonty.org
Mon Nov 8 10:21:25 EET 2010


At file:///home/psergey/dev2/maria-5.3-mwl128-dsmrr-cpk/

------------------------------------------------------------
revno: 2848
revision-id: psergey at askmonty.org-20101108082125-l3nv9xh8775s88z2
parent: psergey at askmonty.org-20101108050200-l6v9bg0rtc3zz5tj
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: maria-5.3-mwl128-dsmrr-cpk
timestamp: Mon 2010-11-08 11:21:25 +0300
message:
  Fix buildbot failure: minimum join_ buffer_size is different on different platforms
=== modified file 'mysql-test/r/myisam_mrr.result'
--- a/mysql-test/r/myisam_mrr.result	2010-11-08 05:02:00 +0000
+++ b/mysql-test/r/myisam_mrr.result	2010-11-08 08:21:25 +0000
@@ -469,8 +469,6 @@
 set join_cache_level = 6;
 set @save_join_buffer_size=@@join_buffer_size;
 set join_buffer_size = 136;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '136'
 CREATE TABLE `t1` (
 `pk` int(11) NOT NULL AUTO_INCREMENT,
 `col_int_key` int(11) NOT NULL,

=== modified file 'mysql-test/t/myisam_mrr.test'
--- a/mysql-test/t/myisam_mrr.test	2010-11-07 15:21:27 +0000
+++ b/mysql-test/t/myisam_mrr.test	2010-11-08 08:21:25 +0000
@@ -177,7 +177,9 @@
 set @save_join_cache_level = @@join_cache_level;
 set join_cache_level = 6;
 set @save_join_buffer_size=@@join_buffer_size;
+--disable_warnings
 set join_buffer_size = 136;
+--enable_warnings
 
 CREATE TABLE `t1` (
   `pk` int(11) NOT NULL AUTO_INCREMENT,



More information about the commits mailing list