diff options
| author | unknown <dlenev@mysql.com> | 2005-12-07 20:31:10 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-12-07 20:31:10 +0300 |
| commit | 4da61404a603d1a0cebef80ef727282764d537ce (patch) | |
| tree | 63048d8f69413e74c776a10754dd280d3dd3227a /sql/sp.cc | |
| parent | d85d70303dc2376014f34f58bd201555af03d6cf (diff) | |
| parent | 0f9a9078309bc058e9f898a5a5e3f48852a102da (diff) | |
| download | mariadb-git-4da61404a603d1a0cebef80ef727282764d537ce.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 1cc4091dd56..d5b93f0d2f2 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -467,7 +467,7 @@ sp_returns_type(THD *thd, String &result, sp_head *sp) bzero(&table, sizeof(table)); table.in_use= thd; table.s = &table.share_not_to_be_used; - field= sp->make_field(0, 0, &table); + field= sp->create_result_field(0, 0, &table); field->sql_type(result); delete field; } |