diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-12-16 09:49:16 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-12-16 09:49:16 +0100 |
| commit | a2a4c70c1bfd077a1281604bdd8368dd32ab6e83 (patch) | |
| tree | b2d3e2437e6035344c65d7b33d31455bc8ebfb28 /include | |
| parent | a893a64e2342eb4d179db46c5f85d4c86c45a4ed (diff) | |
| parent | 5cd3dffebb2abd5778e819ac57001e0d963484d8 (diff) | |
| download | mariadb-git-a2a4c70c1bfd077a1281604bdd8368dd32ab6e83.tar.gz | |
Merge to latest mysql-next-mr
Diffstat (limited to 'include')
| -rw-r--r-- | include/.cvsignore | 4 | ||||
| -rw-r--r-- | include/mysql.h | 10 | ||||
| -rw-r--r-- | include/mysql.h.pp | 10 | ||||
| -rw-r--r-- | include/violite.h | 4 |
4 files changed, 2 insertions, 26 deletions
diff --git a/include/.cvsignore b/include/.cvsignore deleted file mode 100644 index fc53b1b5f65..00000000000 --- a/include/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -my_config.h -mysql_version.h diff --git a/include/mysql.h b/include/mysql.h index 13060264ee7..452b4374cf7 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -459,16 +459,6 @@ unsigned long STDCALL mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, unsigned long length); void STDCALL mysql_debug(const char *debug); -char * STDCALL mysql_odbc_escape_string(MYSQL *mysql, - char *to, - unsigned long to_length, - const char *from, - unsigned long from_length, - void *param, - char * - (*extend_buffer) - (void *, char *to, - unsigned long *length)); void STDCALL myodbc_remove_escape(MYSQL *mysql,char *name); unsigned int STDCALL mysql_thread_safe(void); my_bool STDCALL mysql_embedded(void); diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 78f026215b9..0ea1d0974c2 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -474,16 +474,6 @@ unsigned long mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, unsigned long length); void mysql_debug(const char *debug); -char * mysql_odbc_escape_string(MYSQL *mysql, - char *to, - unsigned long to_length, - const char *from, - unsigned long from_length, - void *param, - char * - (*extend_buffer) - (void *, char *to, - unsigned long *length)); void myodbc_remove_escape(MYSQL *mysql,char *name); unsigned int mysql_thread_safe(void); my_bool mysql_embedded(void); diff --git a/include/violite.h b/include/violite.h index eed6c46271f..34dc6511b3d 100644 --- a/include/violite.h +++ b/include/violite.h @@ -227,8 +227,8 @@ struct st_vio #endif /* HAVE_SMEM */ #ifdef _WIN32 OVERLAPPED pipe_overlapped; - DWORD read_timeout_millis; - DWORD write_timeout_millis; + DWORD read_timeout_ms; + DWORD write_timeout_ms; #endif }; #endif /* vio_violite_h_ */ |