Merge trift2.:/MySQL/M50/spec-5.0

into  trift2.:/MySQL/M50/push-5.0

CMakeLists.txt

@@ -120,6 +120,9 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
 	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG 
 	       ${CMAKE_CXX_FLAGS_DEBUG})
 
+	# generate map files
+	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
+
 	# remove support for Exception handling
 	STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

scripts/Makefile.am

@@ -18,7 +18,7 @@
 BUILT_SOURCES = mysql_fix_privilege_tables.sql \
                 mysql_fix_privilege_tables_sql.c
 
-noinst_PROGRAMS = 	comp_sql
+EXTRA_PROGRAMS = 	comp_sql
 
 bin_SCRIPTS =		@server_scripts@ \
 			msql2mysql \
@@ -70,6 +70,8 @@ EXTRA_DIST =		$(EXTRA_SCRIPTS) \
 			mysqlaccess.conf \
 			mysqlbug \
 			make_win_bin_dist \
+			mysql_fix_privilege_tables.sql \
+			mysql_fix_privilege_tables_sql.c \
 			mysql_system_tables_fix.sql \
 			CMakeLists.txt