diff options
| author | Daniel Fischer <df@sun.com> | 2008-06-11 20:56:45 +0200 |
|---|---|---|
| committer | Daniel Fischer <df@sun.com> | 2008-06-11 20:56:45 +0200 |
| commit | 838fa0d66ac07c963be4328577928bc139447437 (patch) | |
| tree | 81543f308dfc0d1e3869ce7a49fc2968701ec71b /libmysqld/lib_sql.cc | |
| parent | 636e751f3600f093b42ff9ad45f9783badac476a (diff) | |
| parent | b6791a4d372a6bf0a87a8504b824af3d9e2cce46 (diff) | |
| download | mariadb-git-838fa0d66ac07c963be4328577928bc139447437.tar.gz | |
update from bk repository
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 7f2059db7cd..0665641d3b6 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -668,7 +668,7 @@ bool Protocol::send_fields(List<Item> *list, uint flag) DBUG_RETURN(0); field_count= list->elements; - field_alloc= thd->current_stmt ? &thd->current_stmt->mem_root : + field_alloc= thd->current_stmt ? &thd->current_stmt->result.alloc : &mysql->field_alloc; if (!(client_field= mysql->fields= (MYSQL_FIELD *)alloc_root(field_alloc, |