~mdcallag/+junk/5.1-map

« back to all changes in this revision

Viewing changes to sql/CMakeLists.txt

  • Committer: msvensson at pilot
  • Date: 2007-04-24 09:11:45 UTC
  • mfrom: (2469.1.106)
  • Revision ID: sp1r-msvensson@pilot.blaudden-20070424091145-10463
Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Show diffs side-by-side

added added

removed removed

Lines of Context:
47
47
               hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc 
48
48
               item_create.cc item_func.cc item_geofunc.cc item_row.cc 
49
49
               item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc 
50
 
               key.cc log.cc lock.cc log_event.cc message.rc 
 
50
               key.cc log.cc lock.cc message.rc 
 
51
               log_event.cc rpl_record.cc
 
52
               log_event_old.cc rpl_record_old.cc
51
53
               message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c
52
54
               mysqld.cc net_serv.cc 
53
55
               nt_servc.cc nt_servc.h opt_range.cc opt_range.h opt_sum.cc 
79
81
                           ${PROJECT_SOURCE_DIR}/sql/sql_builtin.cc
80
82
                           ${PROJECT_SOURCE_DIR}/sql/lex_hash.h)
81
83
TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl 
82
 
                      taocrypt strings vio regex wsock32)
 
84
                      taocrypt strings vio regex wsock32 ws2_32)
83
85
IF(WITH_ARCHIVE_STORAGE_ENGINE)
84
86
  TARGET_LINK_LIBRARIES(mysqld archive)
85
87
ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)