Ugly merge! But I am not done yet - there are a number of things I need to fix

before I can push


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
include/my_sys.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mini_client.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/structs.h:
  Auto merged
mysql-test/r/rpl000014.result:
  merge
mysql-test/r/rpl000015.result:
  merge
mysql-test/r/rpl000016.result:
  merge
mysql-test/r/rpl_log.result:
  merge
sql/log.cc:
  merge
sql/log_event.cc:
  merge
sql/log_event.h:
  merge
sql/mysqld.cc:
  merge
sql/slave.cc:
  merge
sql/slave.h:
  merge
sql/sql_class.h:
  merge
sql/sql_parse.cc:
  merge
sql/sql_repl.cc:
  merge
sql/sql_yacc.yy:
  merge

1 files changed, 24 insertions, 30 deletions

diff --git a/sql/mini_client.h b/sql/mini_client.h
index b370a498a3f..6721b072080 100644
--- a/sql/mini_client.h
+++ b/sql/mini_client.h
@@ -18,40 +18,34 @@
 #define _MINI_CLIENT_H
 
 
-MYSQL* STDCALL
-mc_mysql_connect(MYSQL *mysql,const char *host, const char *user,
+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);
 
-int STDCALL
-mc_simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
+int mc_simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg,
 		  uint length, my_bool skipp_check);
-void STDCALL
-mc_mysql_close(MYSQL *mysql);
-
-MYSQL * STDCALL
-mc_mysql_init(MYSQL *mysql);
-
-void STDCALL
-mc_mysql_debug(const char *debug);
-
-ulong STDCALL
-mc_net_safe_read(MYSQL *mysql);
-
-char * STDCALL mc_mysql_error(MYSQL *mysql);
-int STDCALL mc_mysql_errno(MYSQL *mysql);
-my_bool STDCALL mc_mysql_reconnect(MYSQL* mysql);
-
-int STDCALL mc_mysql_send_query(MYSQL* mysql, const char* query, uint length);
-int STDCALL mc_mysql_read_query_result(MYSQL *mysql);
-int STDCALL mc_mysql_query(MYSQL *mysql, const char *query, uint length);
-MYSQL_RES * STDCALL mc_mysql_store_result(MYSQL *mysql);
-void STDCALL mc_mysql_free_result(MYSQL_RES *result);
-void STDCALL mc_mysql_data_seek(MYSQL_RES *result, my_ulonglong row);
-my_ulonglong STDCALL mc_mysql_num_rows(MYSQL_RES *res);
-unsigned int STDCALL mc_mysql_num_fields(MYSQL_RES *res);
-MYSQL_ROW STDCALL mc_mysql_fetch_row(MYSQL_RES *res);
-int STDCALL mc_mysql_select_db(MYSQL *mysql, const char *db);
+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); 
 
 #endif