• unknown's avatar
    Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 3bed20c3
    unknown authored
    into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
    
    
    mysql-test/r/order_by.result:
      Auto merged
    mysql-test/r/type_set.result:
      Auto merged
    mysql-test/t/order_by.test:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_cmpfunc.h:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    3bed20c3
sql_table.cc 217 KB