diff options
| author | unknown <serg@serg.mylan> | 2005-06-15 20:24:13 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-06-15 20:24:13 +0200 |
| commit | 7f5890a95179b2fc2db264b717f55843e8e86c54 (patch) | |
| tree | 486ea2ac42145799c897941f8cc31432d9e39b6b /sql/sp_head.h | |
| parent | ee4002915f29da9ec61a2f717e23fb989629c14c (diff) | |
| parent | bb7b0c05dfc38ec386f7460905f8a77e596e1f92 (diff) | |
| download | mariadb-git-7f5890a95179b2fc2db264b717f55843e8e86c54.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index 617d6622037..d22515672f9 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -74,7 +74,7 @@ sp_name * sp_name_current_db_new(THD *thd, LEX_STRING name); -class sp_head :private Item_arena +class sp_head :private Query_arena { sp_head(const sp_head &); /* Prevent use of these */ void operator=(sp_head &); |