Embedded mysql fixes.

There is now a mysql_server_init() function which needs to be
called at the beginning of the program (and _end() for the end
of the program).  This routine handles argument parsing for the
embedded server.

Use the embedded version of mysql_load_file() (ignore the LOCAL
argument, since the client and server are the same program).

There are now mysql_thread_init/end() functions for the client
to use in a multi-threaded app.  They are just wrappers for
my_thread_init/end().

1 files changed, 6 insertions, 8 deletions

diff --git a/libmysqld/lib_load.cc b/libmysqld/lib_load.cc
index 7bdc8837878..37bd611b483 100644
--- a/libmysqld/lib_load.cc
+++ b/libmysqld/lib_load.cc
@@ -21,19 +21,17 @@
 
 int
 mysql_load_internal(THD * thd, sql_exchange * ex, TABLE_LIST * table_list,
-List<Item> & fields, enum enum_duplicates handle_duplicates,
-bool read_file_from_client, thr_lock_type lock_type);
+                    List<Item> & fields, enum enum_duplicates handle_duplicates,
+                    bool read_file_from_client, thr_lock_type lock_type);
 
 int
 mysql_load(THD * thd, sql_exchange * ex, TABLE_LIST * table_list,
-List<Item> & fields, enum enum_duplicates handle_duplicates,
-bool read_file_from_client, thr_lock_type lock_type)
+           List<Item> & fields, enum enum_duplicates handle_duplicates,
+           bool read_file_from_client, thr_lock_type lock_type)
 {
-	printf("SWSOFT_MYSQL load: \n");
   read_file_from_client  = 0; //server is always in the same process 
-    return  mysql_load_internal(thd, ex, table_list, fields, handle_duplicates,
- read_file_from_client, lock_type);
-
+  return  mysql_load_internal(thd, ex, table_list, fields, handle_duplicates,
+                              read_file_from_client, lock_type);
 }
 
 #define mysql_load mysql_load_internal