diff options
author | unknown <sasha@mysql.sashanet.com> | 2002-01-19 19:16:52 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2002-01-19 19:16:52 -0700 |
commit | 5df61c3cdc4499197e420a76b25b942dce0f3ccc (patch) | |
tree | 87da2fd65f79c28f4b97c4619f95b07797107d82 /sql/mini_client.h | |
parent | 0831ce1c616296196eff82065da469156b4def82 (diff) | |
download | mariadb-git-5df61c3cdc4499197e420a76b25b942dce0f3ccc.tar.gz |
Here comes a nasty patch, although I am not ready to push it yet. I will
first pull, merge,test, and get it to work.
The main change is the new replication code - now we have two slave threads
SQL thread and I/O thread. I have also re-written a lot of the code to
prepare for multi-master implementation.
I also documented IO_CACHE quite extensively and to some extend, THD class.
Makefile.am:
moved tags target script into a separate file
include/my_sys.h:
fixes in IO_CACHE for SEQ_READ_APPEND + some documentation
libmysqld/lib_sql.cc:
updated replication locks, but now I see I did it wrong and it won't compile. Will fix
before the push.
mysql-test/r/rpl000014.result:
test result update
mysql-test/r/rpl000015.result:
test result update
mysql-test/r/rpl000016.result:
test result update
mysql-test/r/rpl_log.result:
test result update
mysql-test/t/rpl000016-slave.sh:
remove relay logs
mysql-test/t/rpl000017-slave.sh:
remove relay logs
mysql-test/t/rpl_log.test:
updated test
mysys/mf_iocache.c:
IO_CACHE updates to make replication work
mysys/mf_iocache2.c:
IO_CACHE update to make replication work
mysys/thr_mutex.c:
cosmetic change
sql/item_func.cc:
new replication code
sql/lex.h:
new replication
sql/log.cc:
new replication
sql/log_event.cc:
new replication
sql/log_event.h:
new replication
sql/mini_client.cc:
new replication
sql/mini_client.h:
new replication
sql/mysql_priv.h:
new replication
sql/mysqld.cc:
new replication
sql/repl_failsafe.cc:
new replication
sql/slave.cc:
new replication
sql/slave.h:
new replication
sql/sql_class.cc:
new replication
sql/sql_class.h:
new replication
sql/sql_lex.h:
new replication
sql/sql_parse.cc:
new replication
sql/sql_repl.cc:
new replication
sql/sql_repl.h:
new replication
sql/sql_show.cc:
new replication
sql/sql_yacc.yy:
new replication
sql/stacktrace.c:
more robust stack tracing
sql/structs.h:
new replication code
BitKeeper/etc/ignore:
Added mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval mysql-test/r/rpl000015.eval mysql-test/r/rpl000016.eval mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval to the ignore list
Diffstat (limited to 'sql/mini_client.h')
-rw-r--r-- | sql/mini_client.h | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/sql/mini_client.h b/sql/mini_client.h index de78da06eec..1e17d34244e 100644 --- a/sql/mini_client.h +++ b/sql/mini_client.h @@ -18,41 +18,35 @@ #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 |