resolving of merging conflict

libmysql/libmysql.c:
  conflict resolved

BitKeeper/etc/logging_ok

@@ -29,6 +29,7 @@ heikki@rescue.
 heikki@work.mysql.com
 hf@bison.(none)
 hf@bisonxp.(none)
+hf@deer.(none)
 hf@deer.mysql.r18.ru
 hf@genie.(none)
 igor@hundin.mysql.fi

libmysqld/Makefile.am

@@ -43,14 +43,14 @@ sqlsources = derror.cc field.cc field_conv.cc filesort.cc \
 	item.cc item_buff.cc item_cmpfunc.cc item_create.cc \
 	item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \
 	item_uniq.cc item_subselect.cc item_row.cc\
-	key.cc lock.cc log.cc log_event.cc mf_iocache.cc\
-	mini_client.cc protocol.cc net_serv.cc opt_ft.cc opt_range.cc \
+	key.cc lock.cc log.cc log_event.cc \
+	protocol.cc net_serv.cc opt_ft.cc opt_range.cc \
 	opt_sum.cc procedure.cc records.cc sql_acl.cc \
-	repl_failsafe.cc slave.cc sql_load.cc sql_olap.cc \
+	sql_load.cc sql_olap.cc \
 	sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \
 	sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \
 	sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \
-	sql_prepare.cc sql_derived.cc sql_rename.cc sql_repl.cc \
+	sql_prepare.cc sql_derived.cc sql_rename.cc \
 	sql_select.cc sql_do.cc sql_show.cc set_var.cc \
 	sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \
 	sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \

sql/mini_client.h

@@ -17,30 +17,32 @@
 #ifndef _MINI_CLIENT_H
 #define _MINI_CLIENT_H
 
+MYSQL *
+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,
+		   uint net_read_timeout);
 
-MYSQL* mc_mysql_connect(MYSQL *mysql,const char *host, const char *user,
-			const char *passwd, const char *db,
-			uint port, const char *unix_socket,uint client_flag,
-			uint net_read_timeout);
-int mc_simple_command(MYSQL *mysql,enum enum_server_command command,
-		      const char *arg, uint length, my_bool skipp_check);
-void mc_mysql_close(MYSQL *mysql);
-MYSQL *mc_mysql_init(MYSQL *mysql);
-void mc_mysql_debug(const char *debug);
-ulong mc_net_safe_read(MYSQL *mysql);
-char *mc_mysql_error(MYSQL *mysql);
-int  mc_mysql_errno(MYSQL *mysql);
-my_bool mc_mysql_reconnect(MYSQL* mysql);
-int mc_mysql_send_query(MYSQL* mysql, const char* query, uint length);
-int mc_mysql_read_query_result(MYSQL *mysql);
-int mc_mysql_query(MYSQL *mysql, const char *query, uint length);
-MYSQL_RES * mc_mysql_store_result(MYSQL *mysql);
-void mc_mysql_free_result(MYSQL_RES *result);
-void mc_mysql_data_seek(MYSQL_RES *result, my_ulonglong row);
-my_ulonglong mc_mysql_num_rows(MYSQL_RES *res);
-unsigned int mc_mysql_num_fields(MYSQL_RES *res);
-MYSQL_ROW STDCALL mc_mysql_fetch_row(MYSQL_RES *res);
-int mc_mysql_select_db(MYSQL *mysql, const char *db);
-void mc_end_server(MYSQL *mysql); 
+my_bool simple_command(MYSQL *mysql,enum enum_server_command command,
+		       const char *arg, unsigned long length, 
+		       my_bool skip_check);
+void mysql_close(MYSQL *mysql);
+MYSQL *mysql_init(MYSQL *mysql);
+void mysql_debug(const char *debug);
+ulong net_safe_read(MYSQL *mysql);
+const char *mysql_error(MYSQL *mysql);
+unsigned int  mysql_errno(MYSQL *mysql);
+my_bool mysql_reconnect(MYSQL* mysql);
+int mysql_send_query(MYSQL* mysql, const char* query, uint length);
+my_bool mysql_read_query_result(MYSQL *mysql);
+int mysql_real_query(MYSQL *mysql, const char *q, unsigned long length);
+MYSQL_RES * mysql_store_result(MYSQL *mysql);
+void mysql_free_result(MYSQL_RES *result);
+void mysql_data_seek(MYSQL_RES *result, my_ulonglong row);
+my_ulonglong mysql_num_rows(MYSQL_RES *res);
+unsigned int mysql_num_fields(MYSQL_RES *res);
+MYSQL_ROW STDCALL mysql_fetch_row(MYSQL_RES *res);
+int mysql_select_db(MYSQL *mysql, const char *db);
+void end_server(MYSQL *mysql); 
 
 #endif