diff options
| author | unknown <joreland@mysql.com> | 2004-08-12 12:29:41 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-08-12 12:29:41 +0200 |
| commit | cbfac1be3947b4c9051917f00211b3872740f01a (patch) | |
| tree | e9f2b9050cb0d62d9139f21337f020c76bf9d459 /sql | |
| parent | 84f312be1c9dd0d7886ff57f284e080ab7f6c522 (diff) | |
| parent | 11b2abb20d9feeddc1c925061fbbde5c85b62152 (diff) | |
| download | mariadb-git-cbfac1be3947b4c9051917f00211b3872740f01a.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_sum.cc | 15 | ||||
| -rw-r--r-- | sql/share/charsets/cp852.xml | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 7a8e15e0a9d..c256055d5bb 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1966,12 +1966,12 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) Fix fields for select list and ORDER clause */ - for (i= 0 ; i < arg_count ; i++) + for (i=0 ; i < arg_count ; i++) { if (args[i]->fix_fields(thd, tables, args + i) || args[i]->check_cols(1)) return 1; - if (i < arg_count_field && args[i]->maybe_null) - maybe_null= 0; + if (i < arg_count_field) + maybe_null |= args[i]->maybe_null; } result_field= 0; @@ -2043,10 +2043,13 @@ bool Item_func_group_concat::setup(THD *thd) Note that in the table, we first have the ORDER BY fields, then the field list. + + We need to set set_sum_field in true for storing value of blob in buffer + of a record instead of a pointer of one. */ - if (!(table=create_tmp_table(thd, tmp_table_param, all_fields, 0, - 0, 0, 0,select_lex->options | thd->options, - (char *) ""))) + if (!(table=create_tmp_table(thd, tmp_table_param, all_fields, + (ORDER*) 0, 0, TRUE,select_lex->options | thd->options, + HA_POS_ERROR,(char *) ""))) DBUG_RETURN(1); table->file->extra(HA_EXTRA_NO_ROWS); table->no_rows= 1; diff --git a/sql/share/charsets/cp852.xml b/sql/share/charsets/cp852.xml index ee434859233..958587d0399 100644 --- a/sql/share/charsets/cp852.xml +++ b/sql/share/charsets/cp852.xml @@ -114,6 +114,8 @@ </map> </collation> +<collation name="cp852_bin" flag="binary"/> + </charset> </charsets> |