diff options
| author | serg@serg.mylan <> | 2004-11-11 13:44:10 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-11-11 13:44:10 +0100 |
| commit | aafb2cf6a310552bb4b3e72b8727f15a92b4c4ac (patch) | |
| tree | 1d672204a1e6300782504f85980695c94ebc5b59 /include | |
| parent | 527686bf155c0ec553b70219e51dfcf392c12478 (diff) | |
| parent | d74b5499d25b09aadcf1ca0742b533c20c4a0420 (diff) | |
| download | mariadb-git-aafb2cf6a310552bb4b3e72b8727f15a92b4c4ac.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 2 | ||||
| -rw-r--r-- | include/my_list.h | 4 | ||||
| -rw-r--r-- | include/mysql.h | 17 | ||||
| -rw-r--r-- | include/mysql_com.h | 6 |
4 files changed, 4 insertions, 25 deletions
diff --git a/include/config-win.h b/include/config-win.h index 32ce837e926..1d54a4bf9ec 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -175,6 +175,8 @@ typedef uint rf_SetTimer; #define sigset(A,B) signal((A),(B)) #define finite(A) _finite(A) #define sleep(A) Sleep((A)*1000) +#define popen(A) popen(A,B) _popen((A),(B)) +#define pclose(A) _pclose(A) #ifndef __BORLANDC__ #define access(A,B) _access(A,B) diff --git a/include/my_list.h b/include/my_list.h index 789bbb50f97..f786621e311 100644 --- a/include/my_list.h +++ b/include/my_list.h @@ -33,8 +33,8 @@ extern LIST *list_delete(LIST *root,LIST *element); extern LIST *list_cons(void *data,LIST *root); extern LIST *list_reverse(LIST *root); extern void list_free(LIST *root,unsigned int free_data); -extern unsigned int list_length(LIST *list); -extern int list_walk(LIST *list,list_walk_action action,gptr argument); +extern unsigned int list_length(LIST *); +extern int list_walk(LIST *,list_walk_action action,gptr argument); #define rest(a) ((a)->next) #define list_push(a,b) (a)=list_cons((b),(a)) diff --git a/include/mysql.h b/include/mysql.h index 87c01c9903f..0a7ab09c57b 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -653,23 +653,6 @@ typedef struct st_mysql_methods #endif } MYSQL_METHODS; -#ifdef HAVE_DEPRECATED_411_API -/* Deprecated calls (since MySQL 4.1.2) */ - -/* Use mysql_stmt_init + mysql_stmt_prepare instead */ -MYSQL_STMT * STDCALL mysql_prepare(MYSQL * mysql, const char *query, - unsigned long length); -#define mysql_execute mysql_stmt_execute -#define mysql_fetch mysql_stmt_fetch -#define mysql_fetch_column mysql_stmt_fetch_column -#define mysql_bind_param mysql_stmt_bind_param -#define mysql_bind_result mysql_stmt_bind_result -#define mysql_param_count mysql_stmt_param_count -#define mysql_param_result mysql_stmt_param_metadata -#define mysql_get_metadata mysql_stmt_result_metadata -#define mysql_send_long_data mysql_stmt_send_long_data - -#endif /* HAVE_DEPRECATED_411_API */ MYSQL_STMT * STDCALL mysql_stmt_init(MYSQL *mysql); int STDCALL mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query, diff --git a/include/mysql_com.h b/include/mysql_com.h index 09ee5b22286..92a67ac0279 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -312,13 +312,7 @@ void my_net_local_init(NET *net); void net_end(NET *net); void net_clear(NET *net); my_bool net_realloc(NET *net, unsigned long length); - -#ifndef EMBEDDED_LIBRARY /* To be removed by HF */ my_bool net_flush(NET *net); -#else -#define net_flush(A) -#endif - my_bool my_net_write(NET *net,const char *packet,unsigned long len); my_bool net_write_command(NET *net,unsigned char command, const char *header, unsigned long head_len, |