Commit ac21d029 authored by unknown's avatar unknown
Browse files

Fixes after manual merge

parent 83001499

mysql-test/r/having.result

+0 −17
Original line number Diff line number Diff line
@@ -141,23 +141,6 @@ SUM(a) 
6

4

DROP TABLE t1;



































CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (1), (2), (1), (3), (2), (1);

SELECT a FROM t1 GROUP BY a HAVING a > 1;

sql/sql_prepare.cc

+5 −98
Original line number Diff line number Diff line
@@ -1862,96 +1862,6 @@ void mysql_stmt_prepare(THD *thd, const char *packet, uint packet_length) 
  {

    /* Statement map deletes statement on erase */

    thd->stmt_map.erase(stmt);





















































































































































































  }

  else

    mysql_log.write(thd, COM_STMT_PREPARE, "[%lu] %s", stmt->id, packet);
@@ -2045,14 +1955,11 @@ static const char *get_dynamic_sql_string(LEX *lex, uint *query_len) 
  }

  else

  {

    stmt->setup_set_params();

    SELECT_LEX *sl= stmt->lex->all_selects_list;

    for (; sl; sl= sl->next_select_in_list())

    {

      /*

        during query optimisation.

      */

      sl->prep_where= sl->where;

    query_str= lex->prepared_stmt_code.str;

    *query_len= lex->prepared_stmt_code.length;

  }

end:

  return query_str;

}

sql/sql_select.cc

+2 −2
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ JOIN::optimize() 


  {

    Item::cond_result having_value;

    having= optimize_cond(thd, having, &having_value);

    having= optimize_cond(this, having, join_list, &having_value);

    if (thd->net.report_error)

    {

      error= 1;
@@ -641,7 +641,7 @@ JOIN::optimize() 
    {						/* Impossible cond */

      DBUG_PRINT("info", (having_value == Item::COND_FALSE ? 

                            "Impossible HAVING" : "Impossible WHERE"));

      zero_result_cause=  ?

      zero_result_cause=  having_value == Item::COND_FALSE ?

                           "Impossible HAVING" : "Impossible WHERE";

      error= 0;

      DBUG_RETURN(0);