← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_show.cc

  • Committer: Monty Taylor
  • Date: 2008-07-09 16:33:52 UTC
  • mto: (77.6.1 glibclient-merge)
  • mto: This revision was merged to the branch mainline in revision 112.
  • Revision ID: monty@inaugust.com-20080709163352-yv7jbu81frc1l4ec
Finished the warnings work!

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_show.cc
181
181
}
182
182
 
183
183
 
184
 
int fill_plugins(THD *thd, TABLE_LIST *tables, COND *cond)
 
184
int fill_plugins(THD *thd, TABLE_LIST *tables, COND *cond __attribute__((__unused__)))
185
185
{
186
186
  TABLE *table= tables->table;
187
187
 
564
564
 
565
565
/* Append directory name (if exists) to CREATE INFO */
566
566
 
567
 
static void append_directory(THD *thd, String *packet, const char *dir_type,
 
567
static void append_directory(THD *thd __attribute__((__unused__)),
 
568
                             String *packet, const char *dir_type,
568
569
                             const char *filename)
569
570
{
570
571
  if (filename)
581
582
 
582
583
#define LIST_PROCESS_HOST_LEN 64
583
584
 
584
 
static bool get_field_default_value(THD *thd, Field *timestamp_field,
 
585
static bool get_field_default_value(THD *thd __attribute__((__unused__)),
 
586
                                    Field *timestamp_field,
585
587
                                    Field *field, String *def_value,
586
588
                                    bool quoted)
587
589
{
1056
1058
  return(FALSE);
1057
1059
}
1058
1060
 
1059
 
static void store_key_options(THD *thd, String *packet, TABLE *table,
 
1061
static void store_key_options(THD *thd __attribute__((__unused__)),
 
1062
                              String *packet, TABLE *table,
1060
1063
                              KEY *key_info)
1061
1064
{
1062
1065
  char *end, buff[32];
1218
1221
  return;
1219
1222
}
1220
1223
 
1221
 
int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond)
 
1224
int fill_schema_processlist(THD* thd, TABLE_LIST* tables,
 
1225
                            COND* cond __attribute__((__unused__)))
1222
1226
{
1223
1227
  TABLE *table= tables->table;
1224
1228
  CHARSET_INFO *cs= system_charset_info;
1526
1530
      Repeat as necessary, if new var is again SHOW_FUNC
1527
1531
    */
1528
1532
    for (var=variables; var->type == SHOW_FUNC; var= &tmp)
1529
 
      ((mysql_show_var_func)((st_show_var_func_container)var->value)->func)(thd, &tmp, buff);
 
1533
      ((mysql_show_var_func)((st_show_var_func_container *)var->value)->func)(thd, &tmp, buff);
1530
1534
 
1531
1535
    SHOW_TYPE show_type=var->type;
1532
1536
    if (show_type == SHOW_ARRAY)
2389
2393
 
2390
2394
static uint get_table_open_method(TABLE_LIST *tables,
2391
2395
                                  ST_SCHEMA_TABLE *schema_table,
2392
 
                                  enum enum_schema_tables schema_table_idx)
 
2396
                                  enum enum_schema_tables schema_table_idx __attribute__((__unused__)))
2393
2397
{
2394
2398
  /*
2395
2399
    determine which method will be used for table opening
2429
2433
*/
2430
2434
 
2431
2435
static int fill_schema_table_from_frm(THD *thd,TABLE_LIST *tables,
2432
 
                                      ST_SCHEMA_TABLE *schema_table, 
 
2436
                                      ST_SCHEMA_TABLE *schema_table,
2433
2437
                                      LEX_STRING *db_name,
2434
2438
                                      LEX_STRING *table_name,
2435
 
                                      enum enum_schema_tables schema_table_idx)
 
2439
                                      enum enum_schema_tables schema_table_idx __attribute__((__unused__)))
2436
2440
{
2437
2441
  TABLE *table= tables->table;
2438
2442
  TABLE_SHARE *share;
3219
3223
 
3220
3224
 
3221
3225
 
3222
 
int fill_schema_charsets(THD *thd, TABLE_LIST *tables, COND *cond)
 
3226
int fill_schema_charsets(THD *thd, TABLE_LIST *tables, COND *cond __attribute__((__unused__)))
3223
3227
{
3224
3228
  CHARSET_INFO **cs;
3225
3229
  const char *wild= thd->lex->wild ? thd->lex->wild->ptr() : NullS;
3250
3254
}
3251
3255
 
3252
3256
 
3253
 
int fill_schema_collation(THD *thd, TABLE_LIST *tables, COND *cond)
 
3257
int fill_schema_collation(THD *thd, TABLE_LIST *tables, COND *cond __attribute__((__unused__)))
3254
3258
{
3255
3259
  CHARSET_INFO **cs;
3256
3260
  const char *wild= thd->lex->wild ? thd->lex->wild->ptr() : NullS;
3292
3296
}
3293
3297
 
3294
3298
 
3295
 
int fill_schema_coll_charset_app(THD *thd, TABLE_LIST *tables, COND *cond)
 
3299
int fill_schema_coll_charset_app(THD *thd, TABLE_LIST *tables, COND *cond __attribute__((__unused__)))
3296
3300
{
3297
3301
  CHARSET_INFO **cs;
3298
3302
  TABLE *table= tables->table;
3596
3600
}
3597
3601
 
3598
3602
 
3599
 
int fill_open_tables(THD *thd, TABLE_LIST *tables, COND *cond)
 
3603
int fill_open_tables(THD *thd, TABLE_LIST *tables, COND *cond __attribute__((__unused__)))
3600
3604
{
3601
3605
  const char *wild= thd->lex->wild ? thd->lex->wild->ptr() : NullS;
3602
3606
  TABLE *table= tables->table;
3620
3624
}
3621
3625
 
3622
3626
 
3623
 
int fill_variables(THD *thd, TABLE_LIST *tables, COND *cond)
 
3627
int fill_variables(THD *thd, TABLE_LIST *tables, COND *cond __attribute__((__unused__)))
3624
3628
{
3625
3629
  int res= 0;
3626
3630
  LEX *lex= thd->lex;
3643
3647
}
3644
3648
 
3645
3649
 
3646
 
int fill_status(THD *thd, TABLE_LIST *tables, COND *cond)
 
3650
int fill_status(THD *thd, TABLE_LIST *tables, COND *cond __attribute__((__unused__)))
3647
3651
{
3648
3652
  LEX *lex= thd->lex;
3649
3653
  const char *wild= lex->wild ? lex->wild->ptr() : NullS;
3781
3785
    0   table not found
3782
3786
    1   found the schema table
3783
3787
*/
3784
 
static my_bool find_schema_table_in_plugin(THD *thd, plugin_ref plugin,
 
3788
static my_bool find_schema_table_in_plugin(THD *thd __attribute__((__unused__)),
 
3789
                                           plugin_ref plugin,
3785
3790
                                           void* p_table)
3786
3791
{
3787
3792
  schema_table_ref *p_schema_table= (schema_table_ref *)p_table;