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

Merge 10.0 into 10.1

Browse Source 
Also, implement MDEV-11027 a little differently from 5.5 and 10.0:

recv_apply_hashed_log_recs(): Change the return type back to void
(DB_SUCCESS was always returned).

Report progress also via systemd using sd_notifyf().
This commit is contained in:
Marko Mäkelä
2017-03-08 19:44:22 +02:00
parent bb4ef470c2 9fe92a9770
commit ad0c218a44
338 changed files with 11292 additions and 5851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tests/mysql_client_test.c
View File

@@ -1,5 +1,5 @@
/* Copyright (c) 2002, 2012, Oracle and/or its affiliates.
Copyright (c) 2008, 2013, Monty Program Ab
/* Copyright (c) 2002, 2014, Oracle and/or its affiliates.
Copyright (c) 2008, 2017, 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
@@ -19344,6 +19344,49 @@ static void test_mdev4326()
}
/**
BUG#17512527: LIST HANDLING INCORRECT IN MYSQL_PRUNE_STMT_LIST()
*/
static void test_bug17512527()
{
MYSQL *conn;
MYSQL_STMT *stmt1, *stmt2;
unsigned long thread_id;
char query[MAX_TEST_QUERY_LENGTH];
int rc;
conn= client_connect(0, MYSQL_PROTOCOL_SOCKET, 1);
stmt1 = mysql_stmt_init(conn);
check_stmt(stmt1);
rc= mysql_stmt_prepare(stmt1, STRING_WITH_LEN("SELECT 1"));
check_execute(stmt1, rc);
stmt2 = mysql_stmt_init(conn);
check_stmt(stmt2);
thread_id= mysql_thread_id(conn);
sprintf(query, "KILL %lu", thread_id);
if (thread_query(query))
exit(1);
rc= mysql_stmt_prepare(stmt2, STRING_WITH_LEN("SELECT 2"));
check_execute(stmt2, rc);
rc= mysql_stmt_execute(stmt1);
check_execute_r(stmt1, rc);
rc= mysql_stmt_execute(stmt2);
check_execute(stmt2, rc);
mysql_close(conn);
mysql_stmt_close(stmt2);
mysql_stmt_close(stmt1);
}
/*
Check compressed protocol
*/
@@ -19715,6 +19758,9 @@ static struct my_tests_st my_tests[]= {
{ "test_bug13001491", test_bug13001491 },
{ "test_mdev4326", test_mdev4326 },
{ "test_ps_sp_out_params", test_ps_sp_out_params },
#ifndef _WIN32
{ "test_bug17512527", test_bug17512527},
#endif
{ "test_compressed_protocol", test_compressed_protocol },
{ "test_big_packet", test_big_packet },
{ 0, 0 }