← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/info_schema/info_schema_methods.cc

  • Committer: Brian Aker
  • Date: 2009-08-18 07:19:56 UTC
  • mfrom: (1116.1.3 stewart)
  • mto: This revision was merged to the branch mainline in revision 1118.
  • Revision ID: brian@gaz-20090818071956-nfpoe9rp3i7p50kx
Merge my branch from Stewart into one branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/info_schema/info_schema_methods.cc
1109
1109
    TableShare *share= show_table->s;
1110
1110
    handler *file= show_table->file;
1111
1111
    StorageEngine *tmp_db_type= share->db_type();
 
1112
 
1112
1113
    if (share->tmp_table == SYSTEM_TMP_TABLE)
1113
1114
    {
1114
1115
      table->field[3]->store(STRING_WITH_LEN("SYSTEM VIEW"), cs);
1135
1136
    table->field[5]->store((int64_t) 0, true);
1136
1137
 
1137
1138
    ptr=option_buff;
1138
 
    if (share->min_rows)
1139
 
    {
1140
 
      ptr= strcpy(ptr," min_rows=")+10;
1141
 
      ptr= int64_t10_to_str(share->min_rows,ptr,10);
1142
 
    }
1143
 
    if (share->max_rows)
1144
 
    {
1145
 
      ptr= strcpy(ptr," max_rows=")+10;
1146
 
      ptr= int64_t10_to_str(share->max_rows,ptr,10);
1147
 
    }
1148
 
    if (share->avg_row_length)
1149
 
    {
1150
 
      ptr= strcpy(ptr," avg_row_length=")+16;
1151
 
      ptr= int64_t10_to_str(share->avg_row_length,ptr,10);
1152
 
    }
 
1139
 
1153
1140
    if (share->db_create_options & HA_OPTION_PACK_KEYS)
1154
1141
    {
1155
1142
      ptr= strcpy(ptr," pack_keys=1")+12;
1181
1168
               share->table_charset->name : "default");
1182
1169
    table->field[17]->store(tmp_buff, strlen(tmp_buff), cs);
1183
1170
 
1184
 
    if (share->comment.str)
1185
 
      table->field[20]->store(share->comment.str, share->comment.length, cs);
 
1171
    if (share->hasComment())
 
1172
      table->field[20]->store(share->getComment(),
 
1173
                              share->getCommentLength(), cs);
1186
1174
 
1187
1175
    if(file)
1188
1176
    {