• unknown's avatar
    Merge mysql.com:/misc/mysql/34749/50-34749 · 111de516
    unknown authored
    into  mysql.com:/misc/mysql/34749/51-34749
    
    
    mysql-test/r/func_misc.result:
      Auto merged
    mysql-test/t/func_misc.test:
      Auto merged
    sql/ha_ndbcluster_cond.cc:
      Auto merged
    sql/ha_ndbcluster_cond.h:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/item_func.h:
      Auto merged
    111de516
ha_ndbcluster_cond.h 13.6 KB