• unknown's avatar
    Merge for Item_equal. · 881534fb
    unknown authored
    BitKeeper/etc/ignore:
      auto-union
    mysql-test/r/bdb.result:
      Auto merged
    mysql-test/r/func_group.result:
      Auto merged
    mysql-test/r/innodb.result:
      Auto merged
    mysql-test/r/heap_btree.result:
      Auto merged
    mysql-test/r/select.result:
      Auto merged
    mysql-test/r/user_var.result:
      Auto merged
    mysql-test/t/range.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/item_func.h:
      Auto merged
    sql/item_row.cc:
      Auto merged
    sql/item_strfunc.h:
      Auto merged
    sql/opt_sum.cc:
      Auto merged
    sql/sql_list.h:
      Auto merged
    mysql-test/r/func_test.result:
      Post-automerge resolution of conflicts
    mysql-test/r/index_merge.result:
      Post-automerge resolution of conflicts
    mysql-test/r/join_outer.result:
      Post-automerge resolution of conflicts
    mysql-test/r/range.result:
      Post-automerge resolution of conflicts
    mysql-test/r/subselect.result:
      Post-automerge resolution of conflicts
    sql/item.cc:
      Post-automerge resolution of conflicts
    sql/item.h:
      Post-automerge resolution of conflicts
    sql/item_cmpfunc.cc:
      Post-automerge resolution of conflicts
    sql/item_cmpfunc.h:
      Post-automerge resolution of conflicts
    sql/opt_range.cc:
      Post-automerge resolution of conflicts
    sql/sql_select.cc:
      Post-automerge resolution of conflicts
    sql/sql_select.h:
      Post-automerge resolution of conflicts
    881534fb
sql_list.h 10.9 KB