Commit 6b2379af authored by unknown's avatar unknown
Browse files

func_gconcat.result: 

  Fixed wrong test case
table.cc:
  Fixed wrong DBUG_ENTER placement


sql/table.cc:
  Fixed wrong DBUG_ENTER placement
mysql-test/r/func_gconcat.result:
  Fixed wrong test case
parent b8633901

mysql-test/r/func_gconcat.result

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ explain extended select grp,group_concat(distinct c order by c desc) from t1 gro 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	9	Using filesort

Warnings:

Note	1003	select `test`.`t1`.`grp` AS `grp`,group_concat(distinct `test`.`t1`.`c` order by `test`.`t1`.`c` separator ',') AS `group_concat(distinct c order by c desc)` from `test`.`t1` group by `test`.`t1`.`grp`

Note	1003	select `test`.`t1`.`grp` AS `grp`,group_concat(distinct `test`.`t1`.`c` order by `test`.`t1`.`c` DESC separator ',') AS `group_concat(distinct c order by c desc)` from `test`.`t1` group by `test`.`t1`.`grp`

select grp,group_concat(c order by c separator ",") from t1 group by grp;

grp	group_concat(c order by c separator ",")

1	a
@@ -113,7 +113,7 @@ explain extended select grp,group_concat(distinct c order by c separator ",") fr 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	9	Using filesort

Warnings:

Note	1003	select `test`.`t1`.`grp` AS `grp`,group_concat(distinct `test`.`t1`.`c` order by `test`.`t1`.`c` separator ',') AS `group_concat(distinct c order by c separator ",")` from `test`.`t1` group by `test`.`t1`.`grp`

Note	1003	select `test`.`t1`.`grp` AS `grp`,group_concat(distinct `test`.`t1`.`c` order by `test`.`t1`.`c` ASC separator ',') AS `group_concat(distinct c order by c separator ",")` from `test`.`t1` group by `test`.`t1`.`grp`

select grp,group_concat(distinct c order by c desc separator ",") from t1 group by grp;

grp	group_concat(distinct c order by c desc separator ",")

1	a

sql/table.cc

+1 −1
Original line number Diff line number Diff line
@@ -2511,9 +2511,9 @@ bool st_table_list::prepare_security(THD *thd) 
{

  List_iterator_fast<TABLE_LIST> tb(*view_tables);

  TABLE_LIST *tbl;

  DBUG_ENTER("st_table_list::prepare_security");

#ifndef NO_EMBEDDED_ACCESS_CHECKS

  Security_context *save_security_ctx= thd->security_ctx;

  DBUG_ENTER("st_table_list::prepare_security");



  DBUG_ASSERT(!prelocking_placeholder);

  if (prepare_view_securety_context(thd))