• unknown's avatar
    Merge mysql.com:/home/psergey/tmp_merge2 · a8408dee
    unknown authored
    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
    a8408dee
sql_prepare.cc 83.4 KB