• unknown's avatar
    Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 91d3299c
    unknown authored
    into  olga.mysql.com:/home/igor/mysql-5.1-opt
    
    
    mysql-test/r/distinct.result:
      Auto merged
    mysql-test/r/row.result:
      Auto merged
    mysql-test/r/select.result:
      Auto merged
    mysql-test/r/strict.result:
      Auto merged
    mysql-test/t/select.test:
      Auto merged
    mysql-test/t/strict.test:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/item_cmpfunc.cc:
      Manual merge
    91d3299c
sql_select.cc 497 KB