Commit 47302570 authored by unknown's avatar unknown
Browse files

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  rurik.mysql.com:/home/igor/mysql-5.0


mysql-test/r/rpl_user_variables.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Manual merge
parents c438e490 5aa69d34

sql/sql_prepare.cc

+13 −12
Original line number Diff line number Diff line
@@ -2085,7 +2085,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)

      {