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 10.2 into 10.3

Browse source 
main.derived_cond_pushdown: Move all 10.3 tests to the end,
trim trailing white space, and add an "End of 10.3 tests" marker.
Add --sorted_result to tests where the ordering is not deterministic.

main.win_percentile: Add --sorted_result to tests where the
ordering is no longer deterministic.
This commit is contained in:
Marko Mäkelä 2018-11-06 09:40:39 +02:00
commit df563e0c03
375 changed files with 27579 additions and 14574 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugin/auth_gssapi/mysql-test/auth_gssapi/basic.test
View file

@ -1,3 +1,4 @@
--replace_regex /name '[^']+'/name 'localhost'/
INSTALL SONAME 'auth_gssapi';
#

9
plugin/auth_gssapi/sspi_server.cc
View file

@ -40,7 +40,7 @@ static void log_error(SECURITY_STATUS err, const char *msg)
{
char buf[1024];
sspi_errmsg(err, buf, sizeof(buf));
my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error 0x%x - %s - %s", 0, msg, buf);
my_printf_error(ER_UNKNOWN_ERROR, "SSPI server error 0x%x - %s - %s", 0, err, msg, buf);
}
else
{
@ -101,7 +101,12 @@ static int get_client_name_from_context(CtxtHandle *ctxt,
*p = 0;
}
strncpy(name, native_names.sClientName, name_len);
FreeContextBuffer(&native_names);
if (native_names.sClientName)
FreeContextBuffer(native_names.sClientName);
if (native_names.sServerName)
FreeContextBuffer(native_names.sServerName);
return CR_OK;
}