diff options
| author | unknown <igor@rurik.mysql.com> | 2006-06-02 17:06:10 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-06-02 17:06:10 -0700 |
| commit | 5fd2a3503203ac8263861f25fa80ac5f538b908d (patch) | |
| tree | 15bc7fdfa17f8a8f8f09eda2d7b1452ec5985783 /sql/sql_select.h | |
| parent | cbbd0fdb2c14984e8abf5f9dc8ee8280eda367a9 (diff) | |
| parent | ccad0572f5c7a20d909785732995984de9d76552 (diff) | |
| download | mariadb-git-5fd2a3503203ac8263861f25fa80ac5f538b908d.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
sql/opt_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
mysql-test/r/func_group.result:
SCCS merged
mysql-test/t/func_group.test:
SCCS merged
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 01ed8048e4a..d5a1bf82bc8 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -404,7 +404,7 @@ extern const char *join_type_str[]; void TEST_join(JOIN *join); /* Extern functions in sql_select.cc */ -bool store_val_in_field(Field *field,Item *val); +bool store_val_in_field(Field *field, Item *val, enum_check_fields check_flag); TABLE *create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, ORDER *group, bool distinct, bool save_sum_fields, ulonglong select_options, ha_rows rows_limit, |