Win32 Embedded Server Changes

libmysql/libmysql.def:
  For to have the same order of the 3.23.XX stuff
libmysqld/lib_load.cc:
  For to have the file extension for VC++
libmysqld/lib_sql.cc:
  The VC++ compiler returns duplication define from
  net_serv.cc. If the same happens with Unix then
  those lines should be removed.
  VC++ file extension.
sql/mysqld.cc:
  Changes for Win32 Embedded Server.
sql/net_serv.cc:
  Sanja Fixes.
sql/sql_cache.cc:
  To avoid the crash on Win9x

3 files changed, 83 insertions, 0 deletions

diff --git a/libmysqld/lib_load.cc b/libmysqld/lib_load.cc
index 37bd611b483..3db5a2488d1 100644
--- a/libmysqld/lib_load.cc
+++ b/libmysqld/lib_load.cc
@@ -36,4 +36,9 @@ mysql_load(THD * thd, sql_exchange * ex, TABLE_LIST * table_list,
 
 #define mysql_load mysql_load_internal
 
+
+#if defined (__WIN__)
+#include "../sql/sql_load.cpp"
+#else
 #include "../sql/sql_load.cc"
+#endif
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index ed666659af1..1e3ed54ac88 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -24,8 +24,10 @@
 #define main main1
 #define mysql_unix_port mysql_inix_port1
 #define mysql_port mysql_port1
+#if !defined(__WIN__)
 #define net_read_timeout net_read_timeout1
 #define net_write_timeout net_write_timeout1
+#endif
 #define changeable_vars changeable_vars1
 
 extern "C"
@@ -45,7 +47,11 @@ static bool check_user(THD *thd, enum_server_command command,
 void free_defaults_internal(char ** argv) {if (argv) free_defaults(argv);}
 #define free_defaults free_defaults_internal
 
+#if defined (__WIN__)
+#include "../sql/mysqld.cpp"
+#else
 #include "../sql/mysqld.cc"
+#endif
 
 #define SCRAMBLE_LENGTH 8
 C_MODE_START
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
new file mode 100644
index 00000000000..0e126aa9ceb
--- /dev/null
+++ b/libmysqld/libmysqld.def
@@ -0,0 +1,72 @@
+LIBRARY		LIBMYSQLD
+DESCRIPTION	'MySQL 4.0 Embedded Server Library'
+VERSION		4.0
+EXPORTS
+	mysql_server_end
+	mysql_server_init
+	mysql_use_result
+	mysql_thread_safe
+	mysql_thread_id
+	mysql_store_result
+	mysql_stat
+	mysql_shutdown
+	mysql_select_db
+	mysql_row_tell
+	mysql_row_seek
+	mysql_real_query
+	mysql_real_connect
+	mysql_query
+	mysql_ping
+	mysql_options
+	mysql_num_rows
+	mysql_num_fields
+	mysql_list_tables
+	mysql_list_processes
+	mysql_list_fields
+	mysql_list_dbs
+	mysql_kill
+	mysql_insert_id
+	mysql_init
+	mysql_info
+	mysql_get_server_info
+	mysql_get_proto_info
+	mysql_get_host_info
+	mysql_get_client_info
+	mysql_free_result
+	mysql_field_tell
+	mysql_field_count
+	mysql_field_seek
+	mysql_fetch_row
+	mysql_fetch_lengths
+	mysql_fetch_fields
+	mysql_fetch_field_direct
+	mysql_fetch_field
+	mysql_escape_string
+	mysql_real_escape_string
+	mysql_error
+	mysql_errno
+	mysql_eof
+	mysql_dump_debug_info
+	mysql_drop_db
+	mysql_debug
+	mysql_data_seek
+	mysql_create_db
+	mysql_character_set_name
+	mysql_change_user
+	mysql_connect
+	mysql_close
+	mysql_affected_rows
+	mysql_thread_init
+	mysql_thread_end
+	mysql_send_query
+	mysql_read_query_result
+	mysql_refresh
+	mysql_odbc_escape_string
+	myodbc_remove_escape
+
+
+
+
+
+
+