• unknown's avatar
    Resolving conflicts · f5d27e09
    unknown authored
    
    BitKeeper/etc/logging_ok:
      auto-union
    client/mysqltest.c:
      Auto merged
    sql-common/client.c:
      Auto merged
    sql/protocol.cc:
      Auto merged
    sql/sql_client.cc:
      Auto merged
    include/mysql.h:
      Merging (prolly it's the mistake)
    libmysqld/libmysqld.c:
      This code seems to be unnecessary
    f5d27e09
libmysqld.c 10.8 KB