Speed up some innodb tests

Fixed compiler warnings sql/sql_view.cc: Ensure that merged_for_insert is properly reset (Left of an old patch)

Author: montywi

mysql-test/suite/innodb/include/innodb_simulate_comp_failures.inc

@@ -30,6 +30,8 @@ SET GLOBAL innodb_simulate_comp_failures = 25;
 --disable_result_log
 
 let $num_inserts_ind = $num_inserts;
+let $commit_iterations=50;
+
 while ($num_inserts_ind)
 {
  let $repeat = `select floor(rand() * 10)`;
@@ -49,6 +51,9 @@ SELECT COUNT(*) FROM t1;
 
 # do random ops, making sure that some pages will get fragmented and reorganized.
 let $num_ops_ind = $num_ops;
+let $commit_count= $commit_iterations;
+
+BEGIN;
 
 while($num_ops_ind)
 {
@@ -133,9 +138,19 @@ while($num_ops_ind)
  }
  }
 
+ dec $commit_count;
+ if (!$commit_count)
+ {
+ let $commit_count= $commit_iterations;
+ COMMIT;
+ BEGIN;
+ }
+
  dec $num_ops_ind;
 }
 
+COMMIT;
+
 # final cleanup
 DROP TABLE t1;
 

mysql-test/suite/innodb/r/innodb-bigblob.result

@@ -1,6 +1,7 @@
 call mtr.add_suppression("Resizing redo log from *");
 call mtr.add_suppression("Starting to delete and rewrite log files.");
 call mtr.add_suppression("New log files created, LSN=*");
+call mtr.add_suppression("Writer thread is waiting this semaphore");
 create table foo (id varchar(37) not null, content longblob) engine=INNODB;
 insert into foo (id, content) values('xyz', '');
 update foo set content=repeat('a', 43941888) where id='xyz';

mysql-test/suite/innodb/t/innodb-bigblob.opt

@@ -1,2 +1,3 @@
 --max-allowed-packet=128M
 --innodb-log-file-size=210M
+--skip-innodb-doublewrite

mysql-test/suite/innodb/t/innodb-bigblob.test

@@ -9,6 +9,7 @@ let $status_orig=`SELECT @@innodb_status_output`;
 call mtr.add_suppression("Resizing redo log from *");
 call mtr.add_suppression("Starting to delete and rewrite log files.");
 call mtr.add_suppression("New log files created, LSN=*");
+call mtr.add_suppression("Writer thread is waiting this semaphore");
 
 create table foo (id varchar(37) not null, content longblob) engine=INNODB;
 insert into foo (id, content) values('xyz', '');

mysql-test/suite/innodb/t/innodb_simulate_comp_failures-master.opt

@@ -1,2 +1,2 @@
 --innodb-file-per-table
-
+--skip-innodb-doublewrite

sql/sql_view.cc

@@ -1283,6 +1283,11 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
  */
  table->open_type= OT_BASE_ONLY;
 
+ /*
+ Clear old variables in the TABLE_LIST that could be left from an old view
+ */
+ table->merged_for_insert= FALSE;
+
  /*TODO: md5 test here and warning if it is differ */
 
 

storage/mroonga/vendor/groonga/lib/operator.c

@@ -352,7 +352,7 @@ grn_operator_exec_equal(grn_ctx *ctx, grn_obj *x, grn_obj *y)
 grn_bool
 grn_operator_exec_not_equal(grn_ctx *ctx, grn_obj *x, grn_obj *y)
 {
- grn_bool r;
+ grn_bool r= 0;
  GRN_API_ENTER;
  DO_EQ(x, y, r);
  GRN_API_RETURN(!r);