diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-07 13:21:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-03-07 13:21:02 +0100 |
| commit | 2db62f686e148f09fe5fd0b385fc71f2a3c4a133 (patch) | |
| tree | cf1d5d6f0d05f1b50be96d943476173228cbd458 /libmysql | |
| parent | 143f5d9172647a43cdcf5c27b8a78f32c9f639c0 (diff) | |
| parent | d61573d3e5c8f9d85b88f9fa2e79160b159bf67d (diff) | |
| download | mariadb-git-2db62f686e148f09fe5fd0b385fc71f2a3c4a133.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index bb85b47f863..9dd58bebbbe 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -259,6 +259,9 @@ mariadb_dyncol_column_count mariadb_dyncol_prepare_decimal # mariadb_deinitialize_ssl +# low-level API to MySQL protocol +mysql_net_read_packet +mysql_net_field_length # Added in MariaDB-10.0 to stay compatible with MySQL-5.6, yuck! mysql_options4 ) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index a0bfe4e0d4f..a878b2fae44 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4901,3 +4901,16 @@ my_bool STDCALL mysql_read_query_result(MYSQL *mysql) return (*mysql->methods->read_query_result)(mysql); } +/******************************************************************** + mysql_net_ functions - low-level API to MySQL protocol +*********************************************************************/ +ulong STDCALL mysql_net_read_packet(MYSQL *mysql) +{ + return cli_safe_read(mysql); +} + +ulong STDCALL mysql_net_field_length(uchar **packet) +{ + return net_field_length(packet); +} + |