diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-05 01:15:07 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-05 01:15:07 +0200 |
| commit | a53951c6a13fc6433bbf159948ee11b836b440d5 (patch) | |
| tree | f59ef1650029ff1634fb8e8539ee2dd41dcb8872 /sql/sp_head.h | |
| parent | 57c6470b59aa159e64fb3951e7a0c29f3a368625 (diff) | |
| parent | ddf48bed99f612ab30069e89e4e94050931e64a9 (diff) | |
| download | mariadb-git-a53951c6a13fc6433bbf159948ee11b836b440d5.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/t/func_misc.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
strings/ctype-ujis.c:
Auto merged
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index a6a41ec68f9..985d74393ff 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -242,7 +242,7 @@ public: { sp_instr *i; - get_dynamic(&m_instr, (gptr)&i, m_instr.elements-1); + get_dynamic(&m_instr, (uchar*)&i, m_instr.elements-1); return i; } @@ -324,7 +324,7 @@ public: sp_instr *ip; if (i < m_instr.elements) - get_dynamic(&m_instr, (gptr)&ip, i); + get_dynamic(&m_instr, (uchar*)&ip, i); else ip= NULL; return ip; |