mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 07:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.0' into 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2016-03-21 13:02:53 +01:00
commit 3b0c7ac1f9
142 changed files with 383 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/async_queries.c
View file

@ -265,7 +265,7 @@ again:
{
if (mysql_errno(&sd->mysql))
{
/* An error occured. */
/* An error occurred. */
printf("%d | Error: %s\n", sd->index, mysql_error(&sd->mysql));
}
else

8
tests/mysql_client_test.c
View file

@ -11781,10 +11781,10 @@ static void test_bug5315()
rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
DIE_UNLESS(rc == 0);
if (!opt_silent)
printf("Excuting mysql_change_user\n");
printf("Executing mysql_change_user\n");
mysql_change_user(mysql, opt_user, opt_password, current_db);
if (!opt_silent)
printf("Excuting mysql_stmt_execute\n");
printf("Executing mysql_stmt_execute\n");
rc= mysql_stmt_execute(stmt);
DIE_UNLESS(rc != 0);
if (rc)
@ -11794,10 +11794,10 @@ static void test_bug5315()
}
/* check that connection is OK */
if (!opt_silent)
printf("Excuting mysql_stmt_close\n");
printf("Executing mysql_stmt_close\n");
mysql_stmt_close(stmt);
if (!opt_silent)
printf("Excuting mysql_stmt_init\n");
printf("Executing mysql_stmt_init\n");
stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
DIE_UNLESS(rc == 0);

2
tests/nonblock-wrappers.h
View file

@ -30,7 +30,7 @@
/*
Run the appropriate poll() syscall to wait for the event that libmysql
requested. Return which event(s) occured.
requested. Return which event(s) occurred.
*/
static int
wait_for_mysql(MYSQL *mysql, int status)