diff options
| author | unknown <hf@deer.(none)> | 2005-08-27 18:13:26 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-08-27 18:13:26 +0500 |
| commit | 8f3daaf1a0426b49508fe9b403a6006c8ad27c6e (patch) | |
| tree | 88a348eda5ae6c3675612d6fa36f19bc9bfb9e07 /sql/sql_yacc.yy | |
| parent | c11cb6a3a5570ca929f5231744d6aece9b69092c (diff) | |
| parent | 6cca9a0fd3cc4b5eee9436a422394ec574c7d43c (diff) | |
| download | mariadb-git-8f3daaf1a0426b49508fe9b403a6006c8ad27c6e.tar.gz | |
Merge deer.(none):/home/hf/work/mysql-5.0.10499
into deer.(none):/home/hf/work/mysql-5.0.clean
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ae45df81345..c6768f02d4c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1444,7 +1444,7 @@ create_function_tail: sp_prepare_create_field(YYTHD, new_field); if (prepare_create_field(new_field, &unused1, &unused2, &unused2, - 0)) + HA_CAN_GEOMETRY)) YYABORT; sp->m_returns= new_field->sql_type; @@ -1452,6 +1452,7 @@ create_function_tail: sp->m_returns_len= new_field->length; sp->m_returns_pack= new_field->pack_flag; sp->m_returns_typelib= new_field->interval; + sp->m_geom_returns= new_field->geom_type; new_field->interval= NULL; bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics)); |