database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge from 4.1 to 5.0

Browse Source 
mysql-test/r/loaddata.result:
  Add drop tablea after test case
mysql-test/r/type_decimal.result:
  Update warnings
mysql-test/r/union.result:
  Miss in merge
mysql-test/t/loaddata.test:
  Add drop table after test case
sql/opt_sum.cc:
  Add missing }
sql/sql_load.cc:
  Manual merge
This commit is contained in:
unknown
2005-09-23 14:37:22 +02:00
parent 129300f13d
commit 72a8049b0d
6 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/opt_sum.cc
View File

@@ -167,6 +167,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
{
((Item_sum_count*) item)->make_const(count);
recalc_const_item= 1;
}
}
else
const_result= 0;