diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-04 17:24:15 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-04 17:24:15 +0200 |
| commit | 48b5777ebda9bf14c60ad05298dac67933e9799f (patch) | |
| tree | 2c023b5cc7811faea8a9b4ad82998e4624c29068 /sql/item_sum.cc | |
| parent | bbd70fcc43cc889e4593594ee5ca436fe1433aac (diff) | |
| parent | 9a156e1a23046ba3e37bdb1e4e1ad887d3f5829b (diff) | |
| download | mariadb-git-48b5777ebda9bf14c60ad05298dac67933e9799f.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 5573cc132f0..4a94169c6f8 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -705,7 +705,7 @@ int Aggregator_distinct::composite_key_cmp(void* arg, uchar* key1, uchar* key2) C_MODE_START -/* Declarations for auxilary C-callbacks */ +/* Declarations for auxiliary C-callbacks */ int simple_raw_key_cmp(void* arg, const void* key1, const void* key2) { @@ -737,7 +737,7 @@ C_MODE_END @param thd Thread descriptor @return status @retval FALSE success - @retval TRUE faliure + @retval TRUE failure Prepares Aggregator_distinct to process the incoming stream. Creates the temporary table and the Unique class if needed. @@ -1942,7 +1942,7 @@ void Item_sum_count::cleanup() /* - Avgerage + Average */ void Item_sum_avg::fix_length_and_dec_decimal() @@ -2208,7 +2208,7 @@ bool Item_sum_variance::fix_length_and_dec() /* According to the SQL2003 standard (Part 2, Foundations; sec 10.9, aggregate function; paragraph 7h of Syntax Rules), "the declared - type of the result is an implementation-defined aproximate numeric + type of the result is an implementation-defined approximate numeric type. */ if (args[0]->type_handler()->Item_sum_variance_fix_length_and_dec(this)) @@ -2283,7 +2283,7 @@ double Item_sum_variance::val_real() is one or zero. If it's zero, i.e. a population variance, then we only set nullness when the count is zero. - Another way to read it is that 'sample' is the numerical threshhold, at and + Another way to read it is that 'sample' is the numerical threshold, at and below which a 'count' number of items is called NULL. */ DBUG_ASSERT((sample == 0) || (sample == 1)); @@ -4336,7 +4336,7 @@ bool Item_func_group_concat::setup(THD *thd) { /* Force the create_tmp_table() to convert BIT columns to INT - as we cannot compare two table records containg BIT fields + as we cannot compare two table records containing BIT fields stored in the the tree used for distinct/order by. Moreover we don't even save in the tree record null bits where BIT fields store parts of their data. |