~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2009-01-23 06:19:11 UTC
  • mfrom: (779.1.29 devel)
  • mto: (779.3.3 devel)
  • mto: This revision was merged to the branch mainline in revision 811.
  • Revision ID: brian@tangent.org-20090123061911-59es83nxzlyvh5fi
Merge of Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
75
75
****************************************************************************/
76
76
 
77
77
extern "C" unsigned char *get_var_key(user_var_entry *entry, size_t *length,
78
 
                              bool not_used __attribute__((unused)))
 
78
                              bool )
79
79
{
80
80
  *length= entry->name.length;
81
81
  return (unsigned char*) entry->name.str;
429
429
*/
430
430
 
431
431
void
432
 
Diagnostics_area::set_error_status(Session *session __attribute__((unused)),
 
432
Diagnostics_area::set_error_status(Session *,
433
433
                                   uint32_t sql_errno_arg,
434
434
                                   const char *message_arg)
435
435
{
1183
1183
  Item **place;
1184
1184
  Item *old_value;
1185
1185
  /* Placement new was hidden by `new' in ilink (TODO: check): */
1186
 
  static void *operator new(size_t size __attribute__((unused)),
 
1186
  static void *operator new(size_t ,
1187
1187
                            void *mem)
1188
1188
    { return mem; }
1189
 
  static void operator delete(void *ptr __attribute__((unused)),
1190
 
                              size_t size __attribute__((unused)))
 
1189
  static void operator delete(void *,
 
1190
                              size_t )
1191
1191
    {}
1192
 
  static void operator delete(void *ptr __attribute__((unused)),
1193
 
                              void *mem __attribute__((unused)))
 
1192
  static void operator delete(void *,
 
1193
                              void *)
1194
1194
    { /* never called */ }
1195
1195
};
1196
1196
 
1763
1763
 
1764
1764
 
1765
1765
int
1766
 
select_dump::prepare(List<Item> &list __attribute__((unused)),
 
1766
select_dump::prepare(List<Item> &,
1767
1767
                     SELECT_LEX_UNIT *u)
1768
1768
{
1769
1769
  unit= u;
1947
1947
     sortcmp(val1, val2, cache->collation.collation) < 0);
1948
1948
}
1949
1949
 
1950
 
bool select_exists_subselect::send_data(List<Item> &items __attribute__((unused)))
 
1950
bool select_exists_subselect::send_data(List<Item> &)
1951
1951
{
1952
1952
  Item_exists_subselect *it= (Item_exists_subselect *)item;
1953
1953
  if (unit->offset_limit_cnt)
2289
2289
extern "C" void xid_free_hash(void *);
2290
2290
 
2291
2291
unsigned char *xid_get_hash_key(const unsigned char *ptr, size_t *length,
2292
 
                        bool not_used __attribute__((unused)))
 
2292
                        bool )
2293
2293
{
2294
2294
  *length=((XID_STATE*)ptr)->xid.key_length();
2295
2295
  return ((XID_STATE*)ptr)->xid.key();