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.cc | |
| 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.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 9404e803c73..7cc95c33942 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -597,7 +597,7 @@ sp_head::make_field(uint max_length, const char *name, TABLE *dummy) field= ::make_field((char *)0, !m_returns_len ? max_length : m_returns_len, (uchar *)"", 0, m_returns_pack, m_returns, m_returns_cs, - (enum Field::geometry_type)0, Field::NONE, + m_geom_returns, Field::NONE, m_returns_typelib, name ? name : (const char *)m_name.str, dummy); DBUG_RETURN(field); |