diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-01-27 15:26:12 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-01-27 16:40:15 +0100 |
| commit | eb155661383bcf215d38baf5ff2c5b4413a5552d (patch) | |
| tree | 18e9850a8222e42b15df0032204242f3a64f9b6e /sql/sql_prepare.cc | |
| parent | 02cc921a449d847a27a1a942ff5a5b2b9885b1bb (diff) | |
| download | mariadb-git-eb155661383bcf215d38baf5ff2c5b4413a5552d.tar.gz | |
fix failures of ps and ps_1general in --ps-protocol
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 84173e003fa..ee0aa2d73fd 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1836,12 +1836,16 @@ static int mysql_test_show_create_table(Prepared_statement *stmt, if (mysqld_show_create_get_fields(thd, tables, &fields, &buffer)) goto err_exit; - if (send_prep_stmt(stmt, fields.elements) || - thd->protocol->send_result_set_metadata(&fields, Protocol::SEND_EOF) || - thd->protocol->flush()) - goto err_exit; + if (!stmt->is_sql_prepare()) + { + if (send_prep_stmt(stmt, fields.elements) || + 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: DBUG_RETURN(1); |