diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_strfunc.cc | 4 | ||||
| -rw-r--r-- | sql/sql_cache.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index dd1ec6bd2da..40b18755744 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2043,6 +2043,10 @@ String* Item_func_export_set::val_str(String* str) null_value=1; return 0; } + /* + Arg count can only be 3, 4 or 5 here. This is guaranteed from the + grammar for EXPORT_SET() + */ switch(arg_count) { case 5: num_set_values = (uint) args[4]->val_int(); diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 8610fcb8f22..63d4e4222b4 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -2181,7 +2181,7 @@ void Query_cache::free_memory_block(Query_cache_block *block) block->type= Query_cache_block::FREE; // mark block as free in any case DBUG_PRINT("qcache", ("first_block 0x%lx, block 0x%lx, pnext 0x%lx pprev 0x%lx", - (ulong) first_block, (ulong) block,block->pnext, + (ulong) first_block, (ulong) block, (ulong) block->pnext, (ulong) block->pprev)); if (block->pnext != first_block && block->pnext->is_free()) |