database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-04 18:03:14 +03:00
Code

cleanup: cosmetic fixes

Browse Source
This commit is contained in:
Sergei Golubchik 2019-04-20 12:13:42 +02:00
parent 6cc19078ba
commit d3b2228fd8
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/func_gconcat.result
View File

@ -1,4 +1,3 @@
drop table if exists t1, t2;
create table t1 (grp int, a bigint unsigned, c char(10) not null, d char(10) not null); create table t1 (grp int, a bigint unsigned, c char(10) not null, d char(10) not null);
insert into t1 values (1,1,"a","a"); insert into t1 values (1,1,"a","a");
insert into t1 values (2,2,"b","a"); insert into t1 values (2,2,"b","a");

3
mysql-test/t/func_gconcat.test
View File

@ -1,9 +1,6 @@
# #
# simple test of group_concat function # simple test of group_concat function
# #
--disable_warnings
drop table if exists t1, t2;
--enable_warnings
create table t1 (grp int, a bigint unsigned, c char(10) not null, d char(10) not null); create table t1 (grp int, a bigint unsigned, c char(10) not null, d char(10) not null);
insert into t1 values (1,1,"a","a"); insert into t1 values (1,1,"a","a");

2
mysys/tree.c
View File

@ -224,7 +224,7 @@ TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint key_size,
{ {
uint alloc_size; uint alloc_size;
if (tree->flag & TREE_ONLY_DUPS) if (tree->flag & TREE_ONLY_DUPS)
return((TREE_ELEMENT *) 1); return TREE_ELEMENT_UNIQUE;
alloc_size=sizeof(TREE_ELEMENT)+key_size+tree->size_of_element; alloc_size=sizeof(TREE_ELEMENT)+key_size+tree->size_of_element;
tree->allocated+=alloc_size; tree->allocated+=alloc_size;

8
sql/item_sum.h
View File

@ -1479,8 +1479,8 @@ public:
enum Sumfunctype sum_func () const {return GROUP_CONCAT_FUNC;} enum Sumfunctype sum_func () const {return GROUP_CONCAT_FUNC;}
const char *func_name() const { return "group_concat"; } const char *func_name() const { return "group_concat"; }
virtual Item_result result_type () const { return STRING_RESULT; } Item_result result_type () const { return STRING_RESULT; }
virtual Field *make_string_field(TABLE *table); Field *make_string_field(TABLE *table);
enum_field_types field_type() const enum_field_types field_type() const
{ {
if (too_big_for_varchar()) if (too_big_for_varchar())
@ -1522,8 +1522,8 @@ public:
String* val_str(String* str); String* val_str(String* str);
Item *copy_or_same(THD* thd); Item *copy_or_same(THD* thd);
void no_rows_in_result() {} void no_rows_in_result() {}
virtual void print(String *str, enum_query_type query_type); void print(String *str, enum_query_type query_type);
virtual bool change_context_processor(uchar *cntx) bool change_context_processor(uchar *cntx)
{ context= (Name_resolution_context *)cntx; return FALSE; } { context= (Name_resolution_context *)cntx; return FALSE; }
}; };

1
sql/sql_class.h
View File

@ -36,6 +36,7 @@
#include "violite.h" /* vio_is_connected */ #include "violite.h" /* vio_is_connected */
#include "thr_lock.h" /* thr_lock_type, THR_LOCK_DATA, THR_LOCK_INFO */ #include "thr_lock.h" /* thr_lock_type, THR_LOCK_DATA, THR_LOCK_INFO */
#include "thr_timer.h" #include "thr_timer.h"
#include <my_tree.h>
#include "sql_digest_stream.h" // sql_digest_state #include "sql_digest_stream.h" // sql_digest_state