• unknown's avatar
    Merge · d15b31bf
    unknown authored
    
    VC++Files/libmysqld/libmysqld.vcproj:
      Auto merged
    VC++Files/mysqldemb/mysqldemb.vcproj:
      Auto merged
    VC++Files/mysys/mysys.vcproj:
      Auto merged
    VC++Files/sql/mysqld.vcproj:
      Auto merged
    VC++Files/storage/bdb/bdb.vcproj:
      Auto merged
    VC++Files/storage/innobase/innobase.vcproj:
      Auto merged
    config/ac-macros/yassl.m4:
      Auto merged
    libmysql/Makefile.am:
      Auto merged
    libmysql_r/Makefile.am:
      Auto merged
    mysql-test/Makefile.am:
      Auto merged
    sql/item.cc:
      Auto merged
    d15b31bf
mysqld.vcproj 241 KB