← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Brian Aker
  • Date: 2009-02-02 18:19:36 UTC
  • mfrom: (820.1.14 nofrm)
  • Revision ID: brian@tangent.org-20090202181936-l03a2jb3vpndr1k3
Merge from Stewart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
873
873
      packet->append(STRING_WITH_LEN(" ROW_FORMAT="));
874
874
      packet->append(ha_row_type[(uint) create_info.row_type]);
875
875
    }
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
876
    if (table->s->key_block_size)
882
877
    {
883
878
      packet->append(STRING_WITH_LEN(" KEY_BLOCK_SIZE="));
2648
2643
  List<LEX_STRING> db_names;
2649
2644
  LEX_STRING *db_name;
2650
2645
  bool with_i_schema;
2651
 
  HA_CREATE_INFO create;
2652
2646
  Table *table= tables->table;
2653
2647
 
2654
2648
  if (get_lookup_field_values(session, cond, tables, &lookup_field_vals))
2687
2681
      continue;
2688
2682
    }
2689
2683
    {
 
2684
      HA_CREATE_INFO create;
2690
2685
      load_db_opt_by_name(session, db_name->str, &create);
 
2686
 
2691
2687
      if (store_schema_shemata(session, table, db_name,
2692
2688
                               create.default_table_charset))
2693
2689
        return(1);
2782
2778
      ptr= int64_t10_to_str(share->block_size, ptr, 10);
2783
2779
    }
2784
2780
 
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
2781
    table->field[19]->store(option_buff+1,
2794
2782
                            (ptr == option_buff ? 0 :
2795
2783
                             (uint) (ptr-option_buff)-1), cs);