diff options
| author | monty@mysql.com <> | 2003-11-28 14:23:54 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-11-28 14:23:54 +0200 |
| commit | 320fcb0ef61f561cc98551186e2a9b1de4abe033 (patch) | |
| tree | 48ab6a8a0dff816ab7be757cabb3374a2c8f8065 /include | |
| parent | 3f6ef8d1ae9665eeec5a5116933b96978756bbf1 (diff) | |
| parent | 7f9466a717fd295afb39e1397a4625c958415cff (diff) | |
| download | mariadb-git-320fcb0ef61f561cc98551186e2a9b1de4abe033.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_version.h.in | 1 | ||||
| -rw-r--r-- | include/sql_common.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index 31bf2bdd00d..095531d527d 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -19,6 +19,7 @@ #define MYSQL_PORT @MYSQL_TCP_PORT@ #define MYSQL_UNIX_ADDR "@MYSQL_UNIX_ADDR@" #define MYSQL_CONFIG_NAME "my" +#define MYSQL_COMPILATION_COMMENT "@COMPILATION_COMMENT@" /* mysqld compile time options */ #endif /* _CUSTOMCONFIG_ */ diff --git a/include/sql_common.h b/include/sql_common.h index 1c374030a55..fef573f7450 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -22,9 +22,6 @@ extern const char *not_error_sqlstate; extern "C" { #endif -ulong STDCALL net_field_length(uchar **packet); -my_ulonglong net_field_length_ll(uchar **packet); - MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, my_bool default_value, uint server_capabilities); void free_rows(MYSQL_DATA *cur); |