diff options
| author | monty@mysql.com <> | 2004-12-06 11:38:56 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-06 11:38:56 +0200 |
| commit | 0de4777187a869b4a070ba1e0da28a2ffe1abf05 (patch) | |
| tree | a7bb331b7dac7ac2b3cda915e99bb8c1333f4fec /sql/mysql_priv.h | |
| parent | 86508ad9690c61e806acf308b57c6431b1a2dd99 (diff) | |
| parent | dededf09fa8cb1096549e74f543c84b81e413066 (diff) | |
| download | mariadb-git-0de4777187a869b4a070ba1e0da28a2ffe1abf05.tar.gz | |
Merge with 4.1
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 09bec0a9323..91d15dc1125 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -788,7 +788,8 @@ bool add_field_to_list(THD *thd, char *field_name, enum enum_field_types type, uint type_modifier, Item *default_value, Item *on_update_value, LEX_STRING *comment, - char *change, TYPELIB *interval,CHARSET_INFO *cs, + char *change, List<String> *interval_list, + CHARSET_INFO *cs, uint uint_geom_type); void store_position_for_column(const char *name); bool add_to_list(THD *thd, SQL_LIST &list,Item *group,bool asc=0); |