• unknown's avatar
    Merge mysql.com:/home/hf/work/25097/my50-25097 · 33c43019
    unknown authored
    into  mysql.com:/home/hf/work/25097/my51-25097
    
    
    client/mysql.cc:
      Auto merged
    include/sql_common.h:
      Auto merged
    libmysql/libmysql.c:
      Auto merged
    libmysqld/lib_sql.cc:
      Auto merged
    sql-common/client.c:
      merging
    sql/log.cc:
      merging
    33c43019
mysql.cc 113 KB