firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 04:03:03 +01:00
Code Issues

Misc

Browse Source
This commit is contained in:
asfernandes 2010-01-21 02:51:32 +00:00
parent 355d996462
commit 2faab16698
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/classes/vector.h
View File

@ -177,4 +177,3 @@ public:
} // namespace Firebird
#endif

23
src/dsql/parse.y
View File

@ -4381,14 +4381,15 @@ plan_expression : plan_type '(' plan_item_list ')'
{ $$ = make_node (nod_plan_expr, 1, make_list ($3)); }
;
plan_type : JOIN
| SORT MERGE
| MERGE
| HASH
| SORT
|
{ $$ = NULL; }
;
plan_type
:
{ $$ = NULL; }
| JOIN
| SORT MERGE
| MERGE
| HASH
| SORT
;
plan_item_list : plan_item
| plan_item ',' plan_item_list
@ -5326,10 +5327,10 @@ window_function
;
window_partition_opt
: PARTITION BY value_list
{ $$ = $3; }
|
:
{ $$ = NULL; }
| PARTITION BY value_list
{ $$ = $3; }
;
delimiter_opt

3
src/dsql/pass1.cpp
View File

@ -8204,7 +8204,7 @@ static dsql_nod* pass1_rse_impl( DsqlCompilerScratch* dsqlScratch, dsql_nod* inp
}
rse = parent_rse;
// Here we shouldn't have any window mapping.
// Here we shouldn't have any window mapping. We could have 1 or no map for the aggregate.
size_t mapCount = parent_context->ctx_maps.getCount();
fb_assert(mapCount <= 1);
@ -11695,6 +11695,7 @@ void DSQL_pretty(const dsql_nod* node, int column)
dsql_map* map = (*nodeMap)->map;
if (map != NULL)
trace_line("%s map\n", buffer);
while (map)
{
trace_line("%s position %d\n", buffer, map->map_position);

2
src/jrd/TempSpace.cpp
View File

@ -37,7 +37,7 @@ using Firebird::TempFile;
// Static definitions/initializations
const size_t MIN_TEMP_BLOCK_SIZE = 64 * 1024;
const size_t MIN_TEMP_BLOCK_SIZE = 64 * 1024;
Firebird::GlobalPtr<Firebird::Mutex> TempSpace::initMutex;
Firebird::TempDirectoryList* TempSpace::tempDirs = NULL;

1
src/jrd/met_proto.h
View File

@ -126,4 +126,3 @@ Firebird::MetaName MET_get_relation_field(Jrd::thread_db*, const Firebird::MetaN
void MET_update_partners(Jrd::thread_db*);
#endif // JRD_MET_PROTO_H