database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fix failures of ps and ps_1general in --ps-protocol

Browse Source
This commit is contained in:
Sergei Golubchik
2016-01-27 15:26:12 +01:00
parent 02cc921a44
commit eb15566138
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_prepare.cc
View File

@ -1836,12 +1836,16 @@ static int mysql_test_show_create_table(Prepared_statement *stmt,
if (mysqld_show_create_get_fields(thd, tables, &fields, &buffer)) if (mysqld_show_create_get_fields(thd, tables, &fields, &buffer))
goto err_exit; goto err_exit;
if (send_prep_stmt(stmt, fields.elements) || if (!stmt->is_sql_prepare())
thd->protocol->send_result_set_metadata(&fields, Protocol::SEND_EOF) || {
thd->protocol->flush()) if (send_prep_stmt(stmt, fields.elements) ||
goto err_exit; thd->protocol->send_result_set_metadata(&fields, Protocol::SEND_EOF) ||
thd->protocol->flush())
goto err_exit;
DBUG_RETURN(2); DBUG_RETURN(2);
}
DBUG_RETURN(0);
err_exit: err_exit:
DBUG_RETURN(1); DBUG_RETURN(1);