diff options
| author | unknown <venu@myvenu.com> | 2003-07-04 11:29:25 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-07-04 11:29:25 -0700 |
| commit | e25c83e0c6b6db5c5aec223b8f4d18210017181d (patch) | |
| tree | 322fd10a13c277a1fe8e340c81ed954b1a5ca4fe /sql | |
| parent | 0333deefd229929abda46f94148e34c36973a93b (diff) | |
| parent | d30c9e8e810fb222eec8c87e1f32119b22db6c6c (diff) | |
| download | mariadb-git-e25c83e0c6b6db5c5aec223b8f4d18210017181d.tar.gz | |
Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_prepare.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index fcddc2d2252..c38fb44db1c 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -659,10 +659,13 @@ static bool mysql_test_select_fields(PREP_STMT *stmt, TABLE_LIST *tables, wild_num, conds, og_num, order, group, having, proc, select_lex, unit, 0)) DBUG_RETURN(1); +#ifndef EMBEDDED_LIBRARY if (send_prep_stmt(stmt, fields.elements) || thd->protocol_simple.send_fields(&fields, 0) || + net_flush(&thd->net) || send_item_params(stmt)) DBUG_RETURN(1); +#endif join->cleanup(); } DBUG_RETURN(0); |