diff options
| author | unknown <konstantin@mysql.com> | 2006-04-23 04:04:36 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-04-23 04:04:36 +0400 |
| commit | 38c4f0b7692611e9eabbe9d91f576410f0ee98dd (patch) | |
| tree | cf86208cb9610e10d0c11805be4ec6bd4a8d4093 /sql/sp_head.h | |
| parent | a0aea60d0e3ea05b8e4d9f58e6ad1d98203eb175 (diff) | |
| parent | 7069599748259e59353bce21e8b5ae7cd4b8ff44 (diff) | |
| download | mariadb-git-38c4f0b7692611e9eabbe9d91f576410f0ee98dd.tar.gz | |
Merge mysql.com:/opt/local/work/tmp_merge
into mysql.com:/opt/local/work/mysql-5.1-merge
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/mysqld.cc:
Manual merge.
sql/sp_head.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 66e0a5856f4..08d503f7415 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -44,7 +44,7 @@ class sp_instr; class sp_instr_opt_meta; class sp_instr_jump_if_not; struct sp_cond_type; -struct sp_pvar; +struct sp_variable; class sp_name : public Sql_alloc { @@ -1075,7 +1075,7 @@ public: virtual void print(String *str); - void add_to_varlist(struct sp_pvar *var) + void add_to_varlist(struct sp_variable *var) { m_varlist.push_back(var); } @@ -1083,7 +1083,7 @@ public: private: uint m_cursor; - List<struct sp_pvar> m_varlist; + List<struct sp_variable> m_varlist; }; // class sp_instr_cfetch : public sp_instr |