← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_show.cc

  • Committer: Brian Aker
  • Date: 2008-11-04 15:39:09 UTC
  • mfrom: (575.1.2 devel)
  • Revision ID: brian@tangent.org-20081104153909-c72hn65udxs1ccal
Merge of Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_show.cc
180
180
}
181
181
 
182
182
 
183
 
int fill_plugins(Session *session, TableList *tables, COND *cond __attribute__((unused)))
 
183
int fill_plugins(Session *session, TableList *tables, COND *)
184
184
{
185
185
  Table *table= tables->table;
186
186
 
563
563
 
564
564
/* Append directory name (if exists) to CREATE INFO */
565
565
 
566
 
static void append_directory(Session *session __attribute__((unused)),
 
566
static void append_directory(Session *,
567
567
                             String *packet, const char *dir_type,
568
 
                             const char *filename)
 
568
                             const char *filename)
569
569
{
570
570
  if (filename)
571
571
  {
581
581
 
582
582
#define LIST_PROCESS_HOST_LEN 64
583
583
 
584
 
static bool get_field_default_value(Session *session __attribute__((unused)),
 
584
static bool get_field_default_value(Session *,
585
585
                                    Field *timestamp_field,
586
586
                                    Field *field, String *def_value,
587
587
                                    bool quoted)
1054
1054
  return(false);
1055
1055
}
1056
1056
 
1057
 
static void store_key_options(Session *session __attribute__((unused)),
 
1057
static void store_key_options(Session *,
1058
1058
                              String *packet, Table *table,
1059
1059
                              KEY *key_info)
1060
1060
{
1096
1096
  {
1097
1097
    return (void*) sql_alloc((uint) size);
1098
1098
  }
1099
 
  static void operator delete(void *ptr __attribute__((unused)),
1100
 
                              size_t size __attribute__((unused)))
 
1099
  static void operator delete(void *, size_t)
1101
1100
  { TRASH(ptr, size); }
1102
1101
 
1103
1102
  ulong thread_id;
1215
1214
  return;
1216
1215
}
1217
1216
 
1218
 
int fill_schema_processlist(Session* session, TableList* tables,
1219
 
                            COND* cond __attribute__((unused)))
 
1217
int fill_schema_processlist(Session* session, TableList* tables, COND*)
1220
1218
{
1221
1219
  Table *table= tables->table;
1222
1220
  const CHARSET_INFO * const cs= system_charset_info;
2385
2383
 
2386
2384
static uint32_t get_table_open_method(TableList *tables,
2387
2385
                                  ST_SCHEMA_TABLE *schema_table,
2388
 
                                  enum enum_schema_tables schema_table_idx __attribute__((unused)))
 
2386
                                  enum enum_schema_tables)
2389
2387
{
2390
2388
  /*
2391
2389
    determine which method will be used for table opening
2428
2426
                                      ST_SCHEMA_TABLE *schema_table,
2429
2427
                                      LEX_STRING *db_name,
2430
2428
                                      LEX_STRING *table_name,
2431
 
                                      enum enum_schema_tables schema_table_idx __attribute__((unused)))
 
2429
                                      enum enum_schema_tables)
2432
2430
{
2433
2431
  Table *table= tables->table;
2434
2432
  TABLE_SHARE *share;
3216
3214
 
3217
3215
 
3218
3216
 
3219
 
int fill_schema_charsets(Session *session, TableList *tables, COND *cond __attribute__((unused)))
 
3217
int fill_schema_charsets(Session *session, TableList *tables, COND *)
3220
3218
{
3221
3219
  CHARSET_INFO **cs;
3222
3220
  const char *wild= session->lex->wild ? session->lex->wild->ptr() : NULL;
3247
3245
}
3248
3246
 
3249
3247
 
3250
 
int fill_schema_collation(Session *session, TableList *tables, COND *cond __attribute__((unused)))
 
3248
int fill_schema_collation(Session *session, TableList *tables, COND *)
3251
3249
{
3252
3250
  CHARSET_INFO **cs;
3253
3251
  const char *wild= session->lex->wild ? session->lex->wild->ptr() : NULL;
3289
3287
}
3290
3288
 
3291
3289
 
3292
 
int fill_schema_coll_charset_app(Session *session, TableList *tables, COND *cond __attribute__((unused)))
 
3290
int fill_schema_coll_charset_app(Session *session, TableList *tables, COND *)
3293
3291
{
3294
3292
  CHARSET_INFO **cs;
3295
3293
  Table *table= tables->table;
3593
3591
}
3594
3592
 
3595
3593
 
3596
 
int fill_open_tables(Session *session, TableList *tables, COND *cond __attribute__((unused)))
 
3594
int fill_open_tables(Session *session, TableList *tables, COND *)
3597
3595
{
3598
3596
  const char *wild= session->lex->wild ? session->lex->wild->ptr() : NULL;
3599
3597
  Table *table= tables->table;
3617
3615
}
3618
3616
 
3619
3617
 
3620
 
int fill_variables(Session *session, TableList *tables, COND *cond __attribute__((unused)))
 
3618
int fill_variables(Session *session, TableList *tables, COND *)
3621
3619
{
3622
3620
  int res= 0;
3623
3621
  LEX *lex= session->lex;
3640
3638
}
3641
3639
 
3642
3640
 
3643
 
int fill_status(Session *session, TableList *tables, COND *cond __attribute__((unused)))
 
3641
int fill_status(Session *session, TableList *tables, COND *)
3644
3642
{
3645
3643
  LEX *lex= session->lex;
3646
3644
  const char *wild= lex->wild ? lex->wild->ptr() : NULL;
3778
3776
    0   table not found
3779
3777
    1   found the schema table
3780
3778
*/
3781
 
static bool find_schema_table_in_plugin(Session *session __attribute__((unused)),
3782
 
                                           plugin_ref plugin,
3783
 
                                           void* p_table)
 
3779
static bool find_schema_table_in_plugin(Session *, plugin_ref plugin,
 
3780
                                        void* p_table)
3784
3781
{
3785
3782
  schema_table_ref *p_schema_table= (schema_table_ref *)p_table;
3786
3783
  const char* table_name= p_schema_table->table_name;