diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2002-12-16 18:58:55 +0400 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2002-12-16 18:58:55 +0400 |
| commit | 8db300257b8e457f63a61d27c16ffeb4e23127b1 (patch) | |
| tree | 84a5d074a9241cebc5ac2f73a883ad6765c39100 /sql/sql_prepare.cc | |
| parent | fce29f66fb95c1742f3a80c67ad92d21f1cc1544 (diff) | |
| parent | 632717fd8d70ff187621df8a0839678ceae19ab5 (diff) | |
| download | mariadb-git-8db300257b8e457f63a61d27c16ffeb4e23127b1.tar.gz | |
Merging
BitKeeper/etc/logging_ok:
auto-union
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 704acc9c1c2..0c21ffe3f95 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -140,7 +140,11 @@ static bool send_prep_stmt(PREP_STMT *stmt, uint columns) int4store(buff, stmt->stmt_id); int2store(buff+4, columns); int2store(buff+6, stmt->param_count); +#ifndef EMBEDDED_LIBRARY return (my_net_write(net, buff, sizeof(buff)) || net_flush(net)); +#else + return true; +#endif } /* @@ -299,7 +303,11 @@ static bool setup_params_data(PREP_STMT *stmt) Item_param *param; DBUG_ENTER("setup_params_data"); +#ifndef EMBEDDED_LIBRARY uchar *pos=(uchar*) thd->net.read_pos+1+MYSQL_STMT_HEADER; //skip header +#else + uchar *pos= 0; //just to compile TODO code for embedded case +#endif uchar *read_pos= pos+(stmt->param_count+7) / 8; //skip null bits if (*read_pos++) //types supplied / first execute |