diff options
| author | unknown <hf@deer.(none)> | 2003-06-03 15:02:57 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-03 15:02:57 +0500 |
| commit | aed6de39b6129d84f091e23b4a8b0f5cc8e6076d (patch) | |
| tree | 52e689b118c79c0b3706dafc28ecf72060fa9844 /libmysql | |
| parent | 62c7d2cd2711d3ab2b7d0adba2947b38168cc4b3 (diff) | |
| download | mariadb-git-aed6de39b6129d84f091e23b4a8b0f5cc8e6076d.tar.gz | |
SCRUM:
splittiln common client's parts
include/sql_common.h:
superfluous #ifdef-s removed
libmysql/client_settings.h:
superfluous #ifdef-s removed
libmysql/libmysql.c:
some litter removed
libmysqld/lib_sql.cc:
here we had wrong parameters
mysys/default.c:
this is not needed anymore - calling code fixed
sql-common/client.c:
code trimmed and simplified
sql/client_settings.h:
code trimmed
sql/repl_failsafe.cc:
option's initialization added
sql/slave.cc:
option's initialization added
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/client_settings.h | 3 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index 253f1515075..47d5185b6ca 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -15,8 +15,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _client_settings_h -#define _client_settings_h static my_bool mysql_client_init=0; extern uint mysql_port; extern my_string mysql_unix_port; @@ -58,4 +56,3 @@ my_bool send_file_to_server(MYSQL *mysql, const char *filename); #define set_sigpipe(mysql) #define reset_sigpipe(mysql) #endif -#endif /* _client_settings_h */ diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 766c62a03eb..44c5e3eecf4 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -99,7 +99,6 @@ TYPELIB sql_protocol_typelib = {array_elements(sql_protocol_names_lib)-1,"", be changed */ #define MAX_LONG_DATA_LENGTH 8192 -/*#define protocol_41(A) ((A)->server_capabilities & CLIENT_PROTOCOL_41)*/ #define unsigned_field(A) ((A)->flags & UNSIGNED_FLAG) static void append_wild(char *to,char *end,const char *wild); @@ -157,10 +156,6 @@ void STDCALL mysql_thread_end() #define reset_sigpipe(mysql) #endif -/* TO DELETE -#define _libmysql_c -#include "../sql-common/client.c" -*/ static MYSQL* spawn_init(MYSQL* parent, const char* host, unsigned int port, const char* user, @@ -987,6 +982,7 @@ mysql_query(MYSQL *mysql, const char *query) return mysql_real_query(mysql,query, (uint) strlen(query)); } + static MYSQL* spawn_init(MYSQL* parent, const char* host, unsigned int port, const char* user, const char* passwd) |