Commit c00a5644 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/psergey/tmp_merge2 

into  mysql.com:/home/psergey/mysql-5.1-merge6


mysql-test/r/rpl_user_variables.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 704a69eb 47302570

sql/sql_prepare.cc

+13 −12
Original line number Diff line number Diff line
@@ -2087,7 +2087,8 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) 
      sl->exclude_from_table_unique_test= FALSE;



      /*

        Copy WHERE, HAVING clause pointers to avoid damaging them by optimisation

        Copy WHERE, HAVING clause pointers to avoid damaging them

        by optimisation

      */

      if (sl->prep_where)

      {