diff options
| author | unknown <hf@deer.(none)> | 2004-08-24 14:24:14 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-08-24 14:24:14 +0500 |
| commit | 4456f6c0409226ff4ed64d6bf56240a0dfb8e2e2 (patch) | |
| tree | 00261de0063dfb27773d1c4cf9fb113fba368792 /libmysqld | |
| parent | 8854eeda26f9b703adca3b4a6a4c072a96d888ce (diff) | |
| parent | 4370db52b28e4ae8b6db9f3eb2789fc4ad4e8c32 (diff) | |
| download | mariadb-git-4456f6c0409226ff4ed64d6bf56240a0dfb8e2e2.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5066
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index f4a53343e45..8092d87b97c 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -72,6 +72,11 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command, THD *thd=(THD *) mysql->thd; NET *net= &mysql->net; + if (thd->data) + { + free_rows(thd->data); + thd->data= 0; + } /* Check that we are calling the client functions in right order */ if (mysql->status != MYSQL_STATUS_READY) { @@ -217,11 +222,6 @@ static int emb_stmt_execute(MYSQL_STMT *stmt) THD *thd= (THD*)stmt->mysql->thd; thd->client_param_count= stmt->param_count; thd->client_params= stmt->params; - if (thd->data) - { - free_rows(thd->data); - thd->data= 0; - } if (emb_advanced_command(stmt->mysql, COM_EXECUTE,0,0, (const char*)&stmt->stmt_id,sizeof(stmt->stmt_id), 1) || |