• unknown's avatar
    Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · dfeac169
    unknown authored
    into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12
    
    
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_cmpfunc.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    mysql-test/r/subselect.result:
      Manual Merge
    dfeac169
item_cmpfunc.h 42.8 KB