diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-18 18:07:45 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-18 18:07:45 -0500 |
| commit | 860576f4161ab0ea29bf7ecf6dee0e9d10b6fed6 (patch) | |
| tree | 4e3298fd280e7e1e3aca5716c0b93f95f636ac4c /include | |
| parent | cd187ecf90e9988e5a729a1a4db7239e3baa2e6c (diff) | |
| parent | f37bdd9c1a29865574b10fe7d21164ee7cae4d19 (diff) | |
| download | mariadb-git-860576f4161ab0ea29bf7ecf6dee0e9d10b6fed6.tar.gz | |
Merge branch '10.0' into 10.0-galera
Merge branch 10.0 till revision:
f37bdd9 - Merge remote-tracking branch 'github/10.0' into 10.0
Conflicts:
.bzrignore
storage/xtradb/CMakeLists.txt
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 6 | ||||
| -rw-r--r-- | include/mysql.h.pp | 2 | ||||
| -rw-r--r-- | include/welcome_copyright_notice.h | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/include/mysql.h b/include/mysql.h index 63e86937063..d9d9739dd1f 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -865,6 +865,12 @@ my_socket STDCALL mysql_get_socket(const MYSQL *mysql); unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql); unsigned int STDCALL mysql_get_timeout_value_ms(const MYSQL *mysql); +/******************************************************************** + mysql_net_ functions - low-level API to MySQL protocol +*********************************************************************/ +unsigned long STDCALL mysql_net_read_packet(MYSQL *mysql); +unsigned long STDCALL mysql_net_field_length(unsigned char **packet); + /* status return codes */ #define MYSQL_NO_DATA 100 #define MYSQL_DATA_TRUNCATED 101 diff --git a/include/mysql.h.pp b/include/mysql.h.pp index dd794e856e1..f2c040b694c 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -747,3 +747,5 @@ int mysql_close_cont(MYSQL *sock, int status); my_socket mysql_get_socket(const MYSQL *mysql); unsigned int mysql_get_timeout_value(const MYSQL *mysql); unsigned int mysql_get_timeout_value_ms(const MYSQL *mysql); +unsigned long mysql_net_read_packet(MYSQL *mysql); +unsigned long mysql_net_field_length(unsigned char **packet); diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 956a9f1c17a..096d42446bc 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2011, 2014, Oracle and/or its affiliates. - Copyright (c) 2011, 2012, Monty Program Ab +/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. + Copyright (c) 2011, 2015, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ -#define COPYRIGHT_NOTICE_CURRENT_YEAR "2014" +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2015" /* This define specifies copyright notice which is displayed by every MySQL |