mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse source 
Conflicts:
	sql/table.cc
This commit is contained in:
Monty 2018-01-27 15:20:01 +02:00
commit 84514ec643
41 changed files with 230 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugin/auth_examples/qa_auth_client.c
View file

@ -90,7 +90,7 @@ static int test_plugin_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
return CR_ERROR;
/* send the reply to the server */
res= vio->write_packet(vio, (const unsigned char *) reply,
strlen(reply) + 1);
(int)strlen(reply) + 1);
if (res)
return CR_ERROR;

2
plugin/auth_examples/qa_auth_interface.c
View file

@ -226,7 +226,7 @@ static int test_plugin_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
return CR_ERROR;
/* send the reply to the server */
res= vio->write_packet(vio, (const unsigned char *) reply,
strlen(reply) + 1);
(int)strlen(reply) + 1);
if (res)
return CR_ERROR;

2
plugin/auth_examples/test_plugin.c
View file

@ -205,7 +205,7 @@ static int test_plugin_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
return CR_ERROR;
/* send the reply to the server */
res= vio->write_packet(vio, (const unsigned char *) reply,
strlen(reply) + 1);
(int)strlen(reply) + 1);
if (res)
return CR_ERROR;