• unknown's avatar
    Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 0ed4d7e8
    unknown authored
    into  gleb.loc:/home/uchum/work/bk/5.1-opt
    
    
    mysql-test/r/create_not_windows.result:
      Auto merged
    mysql-test/r/join_nested.result:
      Auto merged
    mysql-test/r/symlink.result:
      Auto merged
    mysql-test/r/type_ranges.result:
      Auto merged
    mysql-test/r/type_time.result:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/create_not_windows.test:
      Auto merged
    mysql-test/t/symlink.test:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    mysql-test/r/create.result:
      Merge with 5.0-opt.
    mysql-test/r/type_enum.result:
      Merge with 5.0-opt.
    mysql-test/t/type_enum.test:
      Merge with 5.0-opt.
    sql/field_conv.cc:
      Merge with 5.0-opt.
    0ed4d7e8
sql_select.cc 505 KB