~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

Replace macros around unireg.h, store_record,restore_record,cmp_record,empty_record

Show diffs side-by-side

added added

removed removed

Lines of Context:
158
158
    struct drizzled_plugin_manifest *plug= plugin_decl(plugin);
159
159
    const CHARSET_INFO * const cs= system_charset_info;
160
160
  
161
 
    restore_record(table, s->default_values);
 
161
    table->restoreRecordAsDefault();
162
162
  
163
163
    table->field[0]->store(plugin_name(plugin)->str,
164
164
                           plugin_name(plugin)->length, cs);
468
468
      field_list.push_back(new Item_field(field));
469
469
    }
470
470
  }
471
 
  restore_record(table, s->default_values);              // Get empty record
 
471
  table->restoreRecordAsDefault();              // Get empty record
472
472
  table->use_all_columns();
473
473
  if (session->protocol->sendFields(&field_list, Protocol::SEND_DEFAULTS))
474
474
    return;
620
620
  bool show_table_options= false;
621
621
  bitset<MAX_FIELDS> *old_bitmap;
622
622
 
623
 
  restore_record(table, s->default_values); // Get empty record
 
623
  table->restoreRecordAsDefault(); // Get empty record
624
624
 
625
625
  if (share->tmp_table)
626
626
    packet->append(STRING_WITH_LEN("CREATE TEMPORARY TABLE "));
1167
1167
      if (! tmp->protocol->isConnected())
1168
1168
        continue;
1169
1169
 
1170
 
      restore_record(table, s->default_values);
 
1170
      table->restoreRecordAsDefault();
1171
1171
      /* ID */
1172
1172
      table->field[0]->store((int64_t) tmp->thread_id, true);
1173
1173
      /* USER */
1551
1551
          assert(0);
1552
1552
          break;
1553
1553
        }
1554
 
        restore_record(table, s->default_values);
 
1554
        table->restoreRecordAsDefault();
1555
1555
        table->field[0]->store(name_buffer, strlen(name_buffer),
1556
1556
                               system_charset_info);
1557
1557
        table->field[1]->store(pos, (uint32_t) (end - pos), system_charset_info);
2521
2521
      List_iterator_fast<LEX_STRING> it_files(table_names);
2522
2522
      while ((table_name= it_files++))
2523
2523
      {
2524
 
        restore_record(table, s->default_values);
 
2524
        table->restoreRecordAsDefault();
2525
2525
        table->field[schema_table->idx_field1]->
2526
2526
          store(db_name->str, db_name->length, system_charset_info);
2527
2527
        table->field[schema_table->idx_field2]->
2647
2647
bool store_schema_shemata(Session* session, Table *table, LEX_STRING *db_name,
2648
2648
                          const CHARSET_INFO * const cs)
2649
2649
{
2650
 
  restore_record(table, s->default_values);
 
2650
  table->restoreRecordAsDefault();
2651
2651
  table->field[1]->store(db_name->str, db_name->length, system_charset_info);
2652
2652
  table->field[2]->store(cs->csname, strlen(cs->csname), system_charset_info);
2653
2653
  table->field[3]->store(cs->name, strlen(cs->name), system_charset_info);
2725
2725
  DRIZZLE_TIME time;
2726
2726
  const CHARSET_INFO * const cs= system_charset_info;
2727
2727
 
2728
 
  restore_record(table, s->default_values);
 
2728
  table->restoreRecordAsDefault();
2729
2729
  table->field[1]->store(db_name->str, db_name->length, cs);
2730
2730
  table->field[2]->store(table_name->str, table_name->length, cs);
2731
2731
  if (res)
3069
3069
 
3070
3070
    count++;
3071
3071
    /* Get default row, with all NULL fields set to NULL */
3072
 
    restore_record(table, s->default_values);
 
3072
    table->restoreRecordAsDefault();
3073
3073
 
3074
3074
    table->field[1]->store(db_name->str, db_name->length, cs);
3075
3075
    table->field[2]->store(table_name->str, table_name->length, cs);
3140
3140
          wild_case_compare(scs, tmp_cs->csname,wild)))
3141
3141
    {
3142
3142
      const char *comment;
3143
 
      restore_record(table, s->default_values);
 
3143
      table->restoreRecordAsDefault();
3144
3144
      table->field[0]->store(tmp_cs->csname, strlen(tmp_cs->csname), scs);
3145
3145
      table->field[1]->store(tmp_cs->name, strlen(tmp_cs->name), scs);
3146
3146
      comment= tmp_cs->comment ? tmp_cs->comment : "";
3178
3178
          wild_case_compare(scs, tmp_cl->name,wild)))
3179
3179
      {
3180
3180
        const char *tmp_buff;
3181
 
        restore_record(table, s->default_values);
 
3181
        table->restoreRecordAsDefault();
3182
3182
        table->field[0]->store(tmp_cl->name, strlen(tmp_cl->name), scs);
3183
3183
        table->field[1]->store(tmp_cl->csname , strlen(tmp_cl->csname), scs);
3184
3184
        table->field[2]->store((int64_t) tmp_cl->number, true);
3214
3214
      if (!tmp_cl || !(tmp_cl->state & MY_CS_AVAILABLE) ||
3215
3215
          !my_charset_same(tmp_cs,tmp_cl))
3216
3216
        continue;
3217
 
      restore_record(table, s->default_values);
 
3217
      table->restoreRecordAsDefault();
3218
3218
      table->field[0]->store(tmp_cl->name, strlen(tmp_cl->name), scs);
3219
3219
      table->field[1]->store(tmp_cl->csname , strlen(tmp_cl->csname), scs);
3220
3220
      if (schema_table_store_record(session, table))
3261
3261
      const char *str;
3262
3262
      for (uint32_t j=0 ; j < key_info->key_parts ; j++,key_part++)
3263
3263
      {
3264
 
        restore_record(table, s->default_values);
 
3264
        table->restoreRecordAsDefault();
3265
3265
        table->field[1]->store(db_name->str, db_name->length, cs);
3266
3266
        table->field[2]->store(table_name->str, table_name->length, cs);
3267
3267
        table->field[3]->store((int64_t) ((key_info->flags &
3327
3327
                       uint32_t key_len, const char *con_type, uint32_t con_len)
3328
3328
{
3329
3329
  const CHARSET_INFO * const cs= system_charset_info;
3330
 
  restore_record(table, s->default_values);
 
3330
  table->restoreRecordAsDefault();
3331
3331
  table->field[1]->store(db_name->str, db_name->length, cs);
3332
3332
  table->field[2]->store(key_name, key_len, cs);
3333
3333
  table->field[3]->store(db_name->str, db_name->length, cs);
3445
3445
        if (key_part->field)
3446
3446
        {
3447
3447
          f_idx++;
3448
 
          restore_record(table, s->default_values);
 
3448
          table->restoreRecordAsDefault();
3449
3449
          store_key_column_usage(table, db_name, table_name,
3450
3450
                                 key_info->name,
3451
3451
                                 strlen(key_info->name),
3472
3472
      {
3473
3473
        r_info= it1++;
3474
3474
        f_idx++;
3475
 
        restore_record(table, s->default_values);
 
3475
        table->restoreRecordAsDefault();
3476
3476
        store_key_column_usage(table, db_name, table_name,
3477
3477
                               f_key_info->forein_id->str,
3478
3478
                               f_key_info->forein_id->length,
3512
3512
 
3513
3513
  for (; open_list ; open_list=open_list->next)
3514
3514
  {
3515
 
    restore_record(table, s->default_values);
 
3515
    table->restoreRecordAsDefault();
3516
3516
    table->field[0]->store(open_list->db, strlen(open_list->db), cs);
3517
3517
    table->field[1]->store(open_list->table, strlen(open_list->table), cs);
3518
3518
    table->field[2]->store((int64_t) open_list->in_use, true);
3635
3635
    List_iterator_fast<FOREIGN_KEY_INFO> it(f_key_list);
3636
3636
    while ((f_key_info= it++))
3637
3637
    {
3638
 
      restore_record(table, s->default_values);
 
3638
      table->restoreRecordAsDefault();
3639
3639
      table->field[1]->store(db_name->str, db_name->length, cs);
3640
3640
      table->field[9]->store(table_name->str, table_name->length, cs);
3641
3641
      table->field[2]->store(f_key_info->forein_id->str,