← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Jay Pipes
  • Date: 2009-02-04 15:44:25 UTC
  • mfrom: (829 drizzle)
  • mto: This revision was merged to the branch mainline in revision 830.
  • Revision ID: jpipes@serialcoder-20090204154425-th8xfk2ujz2y8xwg
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
48
48
 
49
49
using namespace std;
50
50
 
 
51
extern "C"
 
52
int show_var_cmp(const void *var1, const void *var2);
 
53
 
51
54
inline const char *
52
55
str_or_nil(const char *str)
53
56
{
873
876
      packet->append(STRING_WITH_LEN(" ROW_FORMAT="));
874
877
      packet->append(ha_row_type[(uint) create_info.row_type]);
875
878
    }
876
 
    if (share->transactional != HA_CHOICE_UNDEF)
877
 
    {
878
 
      packet->append(STRING_WITH_LEN(" TRANSACTIONAL="));
879
 
      packet->append(ha_choice_values[(uint) share->transactional], 1);
880
 
    }
881
879
    if (table->s->key_block_size)
882
880
    {
883
881
      packet->append(STRING_WITH_LEN(" KEY_BLOCK_SIZE="));
1224
1222
 
1225
1223
static DYNAMIC_ARRAY all_status_vars;
1226
1224
static bool status_vars_inited= 0;
1227
 
static int show_var_cmp(const void *var1, const void *var2)
 
1225
int show_var_cmp(const void *var1, const void *var2)
1228
1226
{
1229
1227
  return strcmp(((SHOW_VAR*)var1)->name, ((SHOW_VAR*)var2)->name);
1230
1228
}
2648
2646
  List<LEX_STRING> db_names;
2649
2647
  LEX_STRING *db_name;
2650
2648
  bool with_i_schema;
2651
 
  HA_CREATE_INFO create;
2652
2649
  Table *table= tables->table;
2653
2650
 
2654
2651
  if (get_lookup_field_values(session, cond, tables, &lookup_field_vals))
2687
2684
      continue;
2688
2685
    }
2689
2686
    {
 
2687
      HA_CREATE_INFO create;
2690
2688
      load_db_opt_by_name(session, db_name->str, &create);
 
2689
 
2691
2690
      if (store_schema_shemata(session, table, db_name,
2692
2691
                               create.default_table_charset))
2693
2692
        return(1);
2782
2781
      ptr= int64_t10_to_str(share->block_size, ptr, 10);
2783
2782
    }
2784
2783
 
2785
 
    if (share->transactional != HA_CHOICE_UNDEF)
2786
 
    {
2787
 
      ptr+= sprintf(ptr, " TRANSACTIONAL=%s",
2788
 
                    (share->transactional == HA_CHOICE_YES ? "1" : "0"));
2789
 
    }
2790
 
    if (share->transactional != HA_CHOICE_UNDEF)
2791
 
      ptr+= sprintf(ptr, " transactional=%s",
2792
 
                    ha_choice_values[(uint) share->transactional]);
2793
2784
    table->field[19]->store(option_buff+1,
2794
2785
                            (ptr == option_buff ? 0 :
2795
2786
                             (uint) (ptr-option_buff)-1), cs);