• unknown's avatar
    merged · 4f641309
    unknown authored
    
    client/Makefile.am:
      Auto merged
    mysql-test/r/ctype_ucs.result:
      Auto merged
    mysql-test/r/fulltext.result:
      Auto merged
    mysql-test/r/heap.result:
      Auto merged
    mysql-test/r/heap_hash.result:
      Auto merged
    mysql-test/r/select.result:
      Auto merged
    mysql-test/t/select.test:
      Auto merged
    mysql-test/t/user_var.test:
      Auto merged
    ndb/src/mgmsrv/main.cpp:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/slave.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/structs.h:
      Auto merged
    4f641309
user_var.result 5.98 KB