List:Commits« Previous MessageNext Message »
From:sayantan.dutta Date:December 11 2012 1:12pm
Subject:bzr push into mysql-trunk branch (sayantan.dutta:5210 to 5211)
View as plain text  
 5211 sayantan.dutta@stripped	2012-12-11 [merge]
      upmerge 14737171 5.6 => trunk

    modified:
      mysql-test/mysql-test-run.pl
 5210 Neeraj Bisht	2012-12-11 [merge]
      Bug#13992148 - IMPROPER EXECUTION OF QUERY WITH "IN (...UNION...)" 
      
      
      Problem:
      A query with IN clause and have UNION operator on left, 	
      executes improperly.
      
      
      Analysis:-
      
      In case of IN clause, we check whether the number of column on the left and 
      right expression of IN are same or not.
      
      After that we are fixing the field(prepare the subselect engine)of left 
      expression of IN clause.
      
      In case of UNION operator we got the number of column after we prepare 
      subselect_union_engine.Hence we dont have the correct value of number of 
      column, so DEBUG_ASSERT got failed.
      
      
      Possible Solution:-
      First we check fix the field of left side expression and then check the number 
      of column.
     @ mysql-test/include/subquery_sj.inc
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_all.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_all_bka.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_all_bka_nixbnl.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_all_bkaunique.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_dupsweed.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_dupsweed_bka.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_dupsweed_bkaunique.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_firstmatch.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_firstmatch_bka.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_firstmatch_bkaunique.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_loosescan.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_loosescan_bka.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_loosescan_bkaunique.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_mat.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_mat_bka.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_mat_bka_nixbnl.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_mat_bkaunique.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_mat_nosj.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_none.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_none_bka.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_none_bka_nixbnl.result
        change test case for bug 13992148.
     @ mysql-test/r/subquery_sj_none_bkaunique.result
        change test case for bug 13992148.
     @ sql/sql_resolver.cc
        First we check fix the field of left side expression and then 
        check the number of column.

    modified:
      mysql-test/include/subquery_sj.inc
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_bka.result
      mysql-test/r/subquery_sj_all_bka_nixbnl.result
      mysql-test/r/subquery_sj_all_bkaunique.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_bka.result
      mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result
      mysql-test/r/subquery_sj_dupsweed_bkaunique.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_bka.result
      mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result
      mysql-test/r/subquery_sj_firstmatch_bkaunique.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_bka.result
      mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result
      mysql-test/r/subquery_sj_loosescan_bkaunique.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_bka.result
      mysql-test/r/subquery_sj_mat_bka_nixbnl.result
      mysql-test/r/subquery_sj_mat_bkaunique.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nixbnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      sql/sql_resolver.cc
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-11-23 13:12:26 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-12-11 13:11:14 +0000
@@ -701,6 +701,8 @@ sub run_test_server ($$$) {
 	    else {
 	      mtr_report("\nRetrying test $tname, ".
 			 "attempt($retries/$opt_retry)...\n");
+              my $log_file_name= $opt_vardir."/log/".$result->{shortname}.".log";
+              rename $log_file_name,$log_file_name.".failed";
 	      delete($result->{result});
 	      $result->{retries}= $retries+1;
 	      $result->write_test($sock, 'TESTCASE');

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (sayantan.dutta:5210 to 5211) sayantan.dutta11 Dec