1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merging conflicts resolved

This commit is contained in:
hf@deer.(none)
2005-01-11 21:00:53 +04:00
16 changed files with 142 additions and 50 deletions

View File

@@ -2644,6 +2644,7 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
List<Item> *sum_func_list,
uint wild_num)
{
DBUG_ENTER("setup_wild");
if (!wild_num)
return(0);