diff options
| author | unknown <tsmith@maint1.mysql.com> | 2007-06-21 18:58:31 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint1.mysql.com> | 2007-06-21 18:58:31 +0200 |
| commit | a1c0a4b45d5d60322e8615ae7407e90cfcebb576 (patch) | |
| tree | f2b8dc257630c43d5656c14d2fc4a352f295fc34 /sql/sp_pcontext.cc | |
| parent | 02faba53a67cb78905148c06917bf00e9140a382 (diff) | |
| parent | 72253445131fa3033243a9b663f4d88af019c547 (diff) | |
| download | mariadb-git-a1c0a4b45d5d60322e8615ae7407e90cfcebb576.tar.gz | |
Merge maint1.mysql.com:/data/localhome/tsmith/bk/51
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
configure.in:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/query_cache.result:
SCCS merged
Diffstat (limited to 'sql/sp_pcontext.cc')
| -rw-r--r-- | sql/sp_pcontext.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_pcontext.cc b/sql/sp_pcontext.cc index 9c96485b8ec..8babbd52ff6 100644 --- a/sql/sp_pcontext.cc +++ b/sql/sp_pcontext.cc @@ -422,7 +422,7 @@ sp_pcontext::find_cursor(LEX_STRING *name, uint *poff, my_bool scoped) void -sp_pcontext::retrieve_field_definitions(List<create_field> *field_def_lst) +sp_pcontext::retrieve_field_definitions(List<Create_field> *field_def_lst) { /* Put local/context fields in the result list. */ |