summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <iggy@alf.>2007-06-15 14:32:16 -0400
committerunknown <iggy@alf.>2007-06-15 14:32:16 -0400
commit290414712e654bd26c550188cdbf7f95a84c8c21 (patch)
treea99e37995345d1f6afa5a8c17d594bb24252f34c /libmysql
parent442adbb2e4657aca018f9aba42f7dd56b3d0221a (diff)
downloadmariadb-git-290414712e654bd26c550188cdbf7f95a84c8c21.tar.gz
Embedded Server doesn't build on Windows.
- Add build configuration parameter EMBEDDED_ONLY which will configure the VS solution to produce only mysql embedded binary. - Make necessary updates to successfully compile solution. CMakeLists.txt: Embedded Server doesn't build on Windows. - Remove leading space from various definitions. - Remove optimizations from RelWithDebInfo configuration for debugging. - Conditionally add the necessary build directories based on EMBEDDED_ONLY flag. BitKeeper/etc/ignore: Embedded Server doesn't build on Windows. - Ignore CMake's default configuration output directories. - Ignore autogenerated cmake_dummy.c file. libmysql/client_settings.h: Embedded Server doesn't build on Windows. - Build fixup libmysqld/CMakeLists.txt: Embedded Server doesn't build on Windows. - Update for recent changes. libmysqld/libmysqld.def: Embedded Server doesn't build on Windows. - Export necessary methods. libmysqld/examples/CMakeLists.txt: Embedded Server doesn't build on Windows. - Updated include directories. - test_libmysqld fixup. - Added mysqltest_embedded and mysql_client_test_embedded exes needed for testing. sql/mysqld.cc: Embedded Server doesn't build on Windows. - Build fixup. sql/sql_binlog.cc: Embedded Server doesn't build on Windows. - Build fixup. sql-common/client.c: Embedded Server doesn't build on Windows. - Build fixup. storage/federated/CMakeLists.txt: Embedded Server doesn't build on Windows. - Define USE_TLS for embedded only builds. storage/heap/CMakeLists.txt: Embedded Server doesn't build on Windows. - Define USE_TLS for embedded only builds. storage/innobase/CMakeLists.txt: Embedded Server doesn't build on Windows. - Define USE_TLS for embedded only builds. storage/myisam/CMakeLists.txt: Embedded Server doesn't build on Windows. - Define USE_TLS for embedded only builds. storage/myisam/ha_myisam.cc: Embedded Server doesn't build on Windows. - Define USE_TLS for embedded only builds. storage/myisammrg/CMakeLists.txt: Embedded Server doesn't build on Windows. - Define USE_TLS for embedded only builds. win/configure.js: Embedded Server doesn't build on Windows. - Add EMBEDDED_ONLY build configuration.
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/client_settings.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h
index 1d415488037..a803ff8372f 100644
--- a/libmysql/client_settings.h
+++ b/libmysql/client_settings.h
@@ -42,7 +42,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename);
void mysql_read_default_options(struct st_mysql_options *options,
const char *filename,const char *group);
void mysql_detach_stmt_list(LIST **stmt_list, const char *func_name);
-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);