Commit d39e9204 authored by Reggie@xgeek's avatar Reggie@xgeek

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  xgeek.:C:/work/mysql-5.1-new
parents f513420d 36121ee7
...@@ -31,6 +31,6 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visu ...@@ -31,6 +31,6 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visu
ADD_DEFINITIONS("-D_WINDOWS -D__WIN__") ADD_DEFINITIONS("-D_WINDOWS -D__WIN__")
SUBDIRS(vio dbug strings regex mysys extra zlib storage/innobase storage/heap storage/myisam storage/myisammrg SUBDIRS(vio dbug strings regex mysys extra/yassl extra/yassl/taocrypt extra
extra/yassl extra/yassl/taocrypt client sql server-tools/instance-manager zlib storage/innobase storage/heap storage/myisam storage/myisammrg
libmysql tests) client sql server-tools/instance-manager libmysql tests)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment