diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-08-12 16:11:43 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-08-12 16:11:43 +0300 |
| commit | 89b28ebdeb8c646580672b9d7e18d8b26576c0c8 (patch) | |
| tree | c5887f08e93e4230ad43272f74fceef0bd0e36db /sql/mysql_priv.h | |
| parent | 2aed7cf90ef69ad58588cd8296176bad20b9dd04 (diff) | |
| parent | 02e0db5a51c8218ce1cb2ecd29d1001d92e914a7 (diff) | |
| download | mariadb-git-89b28ebdeb8c646580672b9d7e18d8b26576c0c8.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
BitKeeper/etc/ignore:
auto-union
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 63fe65f5251..ffa980013ab 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -316,7 +316,7 @@ int mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &list,COND *conds, List<Item_func_match> &ftfuncs, ORDER *order, ORDER *group,Item *having,ORDER *proc_param, ulong select_type,select_result *result); -int mysql_union(THD *thd,LEX *lex); +int mysql_union(THD *thd,LEX *lex,select_result *create_insert=(select_result *)NULL); Field *create_tmp_field(TABLE *table,Item *item, Item::Type type, Item_result_field ***copy_func, Field **from_field, bool group,bool modify_item); |