diff options
| author | unknown <msvensson@shellback.> | 2006-04-11 12:19:28 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.> | 2006-04-11 12:19:28 +0200 |
| commit | 7152e2aade9236d7d204be71838020367d6c28da (patch) | |
| tree | 80b8074b1996566113c46b23fe7d023918200f51 /libmysqld | |
| parent | 60b628301b7d9037cb6324a60c860bdb65782566 (diff) | |
| parent | 1b8de1e1e5aeb26435022702f1a2fa1b54c2f45b (diff) | |
| download | mariadb-git-7152e2aade9236d7d204be71838020367d6c28da.tar.gz | |
Merge 192.168.0.10:mysql/mysql-5.1
into shellback.:C:/mysql/my51-bug17368
sql/ha_partition.cc:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 70022d526a5..9e763df8a0a 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -274,7 +274,6 @@ static int emb_stmt_execute(MYSQL_STMT *stmt) { DBUG_ENTER("emb_stmt_execute"); char header[5]; - MYSQL_DATA *res; THD *thd; int4store(header, stmt->stmt_id); @@ -1033,7 +1032,6 @@ void Protocol_simple::prepare_for_resend() data->embedded_info->prev_ptr= &cur->next; next_field=cur->data; next_mysql_field= data->embedded_info->fields_list; -err: DBUG_VOID_RETURN; } |