Commit a0067d7f authored by unknown's avatar unknown
Browse files

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

into  linux.site:/home/reggie/work/mysql-5.1
parents e4637759 253289fe

cmakelists.txt

+28 −17
Original line number Diff line number Diff line
@@ -3,34 +3,45 @@ PROJECT(MySql) 
# This reads user configuration, generated by configure.js.

INCLUDE(win/configure.data)



CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in 

               ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)



# in some places we use DBUG_OFF

SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")

SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF")



#IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

#    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")

#    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")

#    SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")

#    SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")

#ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")

    SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")



IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8")

IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 

   CMAKE_GENERATOR MATCHES "Visual Studio 8")

	# replace /MDd with /MTd

	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG_INIT ${CMAKE_C_FLAGS_DEBUG_INIT})

	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})

	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG_INIT 

	       ${CMAKE_CXX_FLAGS_DEBUG_INIT})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG_INIT 

	       ${CMAKE_C_FLAGS_DEBUG_INIT})

	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE 

	       ${CMAKE_C_FLAGS_RELEASE})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG 

	       ${CMAKE_C_FLAGS_DEBUG})

	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE 

	       ${CMAKE_CXX_FLAGS_RELEASE})

	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG 

	       ${CMAKE_CXX_FLAGS_DEBUG})



	# remove support for Exception handling

	STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT ${CMAKE_CXX_FLAGS_INIT})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT})

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8")

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT 

	       ${CMAKE_CXX_FLAGS_INIT})

	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT 

	       ${CMAKE_CXX_FLAGS_DEBUG_INIT})

ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 

      CMAKE_GENERATOR MATCHES "Visual Studio 8")



ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE")

sql/cmakelists.txt

+49 −34
Original line number Diff line number Diff line 
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR")

SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR")

SET(CMAKE_CXX_FLAGS_DEBUG 

    "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR")

SET(CMAKE_C_FLAGS_DEBUG 

    "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR")



INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 

                    ${CMAKE_SOURCE_DIR}/extra/yassl/include
@@ -18,7 +20,8 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc 
                            ${CMAKE_SOURCE_DIR}/sql/lex_hash.h 

                            ${PROJECT_SOURCE_DIR}/include/mysqld_error.h

                            ${PROJECT_SOURCE_DIR}/include/mysqld_ername.h

                            ${PROJECT_SOURCE_DIR}/include/sql_state.h PROPERTIES GENERATED 1)

                            ${PROJECT_SOURCE_DIR}/include/sql_state.h 

                              PROPERTIES GENERATED 1)

                            

IF(WITH_ARCHIVE_STORAGE_ENGINE)

  ADD_DEFINITIONS(-D WITH_ARCHIVE_STORAGE_ENGINE)
@@ -67,30 +70,40 @@ ENDIF(__NT__) 
IF(CYBOZU)

  ADD_DEFINITIONS(-D CYBOZU)

ENDIF(CYBOZU)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in ${CMAKE_SOURCE_DIR}/sql/handlerton.cc @ONLY)

CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in 

               ${CMAKE_SOURCE_DIR}/sql/handlerton.cc @ONLY)



ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN)

ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER 

                -D_CONSOLE -DHAVE_DLOPEN)



SEPARATE_ARGUMENTS(mysql_se_ha_src)

ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc discover.cc ../libmysql/errmsg.c field.cc

					  field_conv.cc filesort.cc gstream.cc  ha_heap.cc ha_myisam.cc ha_myisammrg.cc

					  ${mysql_se_ha_src} handler.cc hash_filo.cc hash_filo.h hostname.cc

					  init.cc item.cc item_buff.cc item_cmpfunc.cc item_create.cc item_func.cc item_geofunc.cc

					  item_row.cc item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc item_uniq.cc

					  key.cc log.cc lock.cc log_event.cc message.rc message.h mf_iocache.cc 

					  my_decimal.cc ../sql-common/my_time.c

					  ../storage/myisammrg/myrg_rnext_same.c mysqld.cc net_serv.cc nt_servc.cc nt_servc.h opt_range.cc opt_range.h

					  opt_sum.cc ../sql-common/pack.c parse_file.cc password.c procedure.cc protocol.cc records.cc 

					  repl_failsafe.cc rpl_filter.cc set_var.cc slave.cc sp.cc sp_cache.cc sp_head.cc 

					  sp_pcontext.cc sp_rcontext.cc spatial.cc sql_acl.cc sql_analyse.cc sql_base.cc sql_cache.cc

					  sql_class.cc sql_client.cc sql_crypt.cc sql_crypt.h sql_cursor.cc sql_db.cc sql_delete.cc

					  sql_derived.cc sql_do.cc sql_error.cc sql_handler.cc sql_help.cc sql_insert.cc

					  sql_lex.cc sql_list.cc sql_load.cc sql_manager.cc sql_map.cc sql_parse.cc sql_partition.cc

					  sql_plugin.cc sql_prepare.cc sql_rename.cc sql_repl.cc sql_select.cc sql_show.cc

					  sql_state.c sql_string.cc sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc

					  sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc time.cc tztime.cc

					  uniques.cc unireg.cc item_xmlfunc.cc rpl_tblmap.cc sql_binlog.cc event_executor.cc

					  event_timed.cc sql_tablespace.cc event.cc ../sql-common/my_user.c partition_info.cc

ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc

               discover.cc ../libmysql/errmsg.c field.cc field_conv.cc 

               filesort.cc gstream.cc  ha_heap.cc ha_myisam.cc ha_myisammrg.cc

               ${mysql_se_ha_src} handler.cc hash_filo.cc hash_filo.h 

               hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc 

               item_create.cc item_func.cc item_geofunc.cc item_row.cc 

               item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc 

               item_uniq.cc key.cc log.cc lock.cc log_event.cc message.rc 

               message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c

               ../storage/myisammrg/myrg_rnext_same.c mysqld.cc net_serv.cc 

               nt_servc.cc nt_servc.h opt_range.cc opt_range.h opt_sum.cc 

               ../sql-common/pack.c parse_file.cc password.c procedure.cc 

               protocol.cc records.cc repl_failsafe.cc rpl_filter.cc set_var.cc 

               slave.cc sp.cc sp_cache.cc sp_head.cc sp_pcontext.cc 

               sp_rcontext.cc spatial.cc sql_acl.cc sql_analyse.cc sql_base.cc 

               sql_cache.cc sql_class.cc sql_client.cc sql_crypt.cc sql_crypt.h 

               sql_cursor.cc sql_db.cc sql_delete.cc sql_derived.cc sql_do.cc 

               sql_error.cc sql_handler.cc sql_help.cc sql_insert.cc sql_lex.cc 

               sql_list.cc sql_load.cc sql_manager.cc sql_map.cc sql_parse.cc 

               sql_partition.cc sql_plugin.cc sql_prepare.cc sql_rename.cc 

               sql_repl.cc sql_select.cc sql_show.cc sql_state.c sql_string.cc 

               sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc

               sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc 

               time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc 

               rpl_tblmap.cc sql_binlog.cc event_executor.cc event_timed.cc 

               sql_tablespace.cc event.cc ../sql-common/my_user.c 

               partition_info.cc

               ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc

  			   ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h

			   ${PROJECT_SOURCE_DIR}/include/mysqld_error.h
@@ -99,7 +112,8 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc discover. 
			   ${PROJECT_SOURCE_DIR}/include/mysql_version.h 

			   ${PROJECT_SOURCE_DIR}/sql/handlerton.cc

			   ${PROJECT_SOURCE_DIR}/sql/lex_hash.h)

TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl taocrypt strings vio regex wsock32)

TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl 

                      taocrypt strings vio regex wsock32)

IF(WITH_ARCHIVE_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld archive)

ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
@@ -119,7 +133,8 @@ ADD_DEPENDENCIES(mysqld GenError) 
ADD_CUSTOM_COMMAND(

	SOURCE ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy 

	OUTPUT ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc

	COMMAND bison.exe ARGS -y -p MYSQL --defines=sql_yacc.h	--output=sql_yacc.cc sql_yacc.yy

	COMMAND bison.exe ARGS -y -p MYSQL --defines=sql_yacc.h	

	                       --output=sql_yacc.cc sql_yacc.yy

	DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy)



ADD_CUSTOM_COMMAND(

storage/csv/cmakelists.txt

0 → 100644
+5 −0
Original line number Diff line number Diff line 
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")

SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")



INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)

ADD_LIBRARY(csv ha_tina.cc ha_tina.h)