bk commit into 5.1 tree (georg:1.2319)

[georg]

Below is the list of changes that have just been committed into a local
5.1 repository of georg. When georg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-16 10:51:10+02:00, georg@stripped +3 -0
  fixed build errors

  libmysql/client_settings.h@stripped, 2006-09-16 10:51:05+02:00, georg@stripped +1 -1
    fixed prototype declaration (compile error with VS2003)

  sql/CMakeLists.txt@stripped, 2006-09-16 10:51:05+02:00, georg@stripped +10 -0
    moved gen_lex_hash back (file is included twice)

  win/CMakeBase.include@stripped, 2006-09-16 10:51:05+02:00, georg@stripped +0 -10
    moved gen_lex_hash back (file is included twice)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.1-win

--- 1.2/win/CMakeBase.include	2006-09-16 10:51:21 +02:00
+++ 1.3/win/CMakeBase.include	2006-09-16 10:51:21 +02:00
@@ -86,13 +86,3 @@
 )
 
 
-# Gen_lex_hash
-ADD_EXECUTABLE(gen_lex_hash ${PROJECT_SOURCE_DIR}/sql/gen_lex_hash.cc)
-TARGET_LINK_LIBRARIES(gen_lex_hash dbug mysqlclient wsock32)
-GET_TARGET_PROPERTY(GEN_LEX_HASH_EXE gen_lex_hash LOCATION)
-ADD_CUSTOM_COMMAND(
-	OUTPUT ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
-	COMMAND ${GEN_LEX_HASH_EXE} ARGS > ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
-	DEPENDS ${GEN_LEX_HASH_EXE}
-)
-

--- 1.33/libmysql/client_settings.h	2006-09-16 10:51:21 +02:00
+++ 1.34/libmysql/client_settings.h	2006-09-16 10:51:21 +02:00
@@ -43,7 +43,7 @@
 void mysql_read_default_options(struct st_mysql_options *options,
 				const char *filename,const char *group);
 void mysql_detach_stmt_list(LIST **stmt_list);
-MYSQL *
+MYSQL * STDCALL
 cli_mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
 		       const char *passwd, const char *db,
 		       uint port, const char *unix_socket,ulong client_flag);

--- 1.34/sql/CMakeLists.txt	2006-09-16 10:51:21 +02:00
+++ 1.35/sql/CMakeLists.txt	2006-09-16 10:51:21 +02:00
@@ -30,6 +30,16 @@
 ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER 
                 -D_CONSOLE -DHAVE_DLOPEN)
 
+# Gen_lex_hash
+ADD_EXECUTABLE(gen_lex_hash ${PROJECT_SOURCE_DIR}/sql/gen_lex_hash.cc)
+TARGET_LINK_LIBRARIES(gen_lex_hash dbug mysqlclient wsock32)
+GET_TARGET_PROPERTY(GEN_LEX_HASH_EXE gen_lex_hash LOCATION)
+ADD_CUSTOM_COMMAND(
+	OUTPUT ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
+	COMMAND ${GEN_LEX_HASH_EXE} ARGS > ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
+	DEPENDS ${GEN_LEX_HASH_EXE}
+)
+
 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