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 | f1f1d39a2996b7856f8bd987f164614f91990cd7 (patch) | |
| tree | 486ea2ac42145799c897941f8cc31432d9e39b6b /sql/sp_head.h | |
| parent | fc465d1497ce598d07ec75eeaafc7ca84b578ee6 (diff) | |
| parent | f1e42a0b354a5d6214b108930d1d55915cbe2122 (diff) | |
| download | mariadb-git-f1f1d39a2996b7856f8bd987f164614f91990cd7.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 &); |