database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2015-02-18 15:16:27 +01:00
parent a06624d61f fdd6c111c2
commit d7e7862364
120 changed files with 3358 additions and 1860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libmysql/CMakeLists.txt
View File

@ -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
)

17
libmysql/libmysql.c
View File

@ -4901,3 +4901,20 @@ 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
*********************************************************************/
#if MYSQL_VERSION_ID > 100100
#error remove these wrappers in 10.1, rename functions instead
#endif
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);
}