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/sp_head.h | |
| 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/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 963d9da07cf..1d4bfb514d3 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -110,6 +110,7 @@ public: int m_type; // TYPE_ENUM_FUNCTION or TYPE_ENUM_PROCEDURE enum enum_field_types m_returns; // For FUNCTIONs only + Field::geometry_type m_geom_returns; CHARSET_INFO *m_returns_cs; // For FUNCTIONs only TYPELIB *m_returns_typelib; // For FUNCTIONs only uint m_returns_len; // For FUNCTIONs only |