← 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

Merged in latest plugin-slot-reorg.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/info_schema/info_schema_methods.cc
28
28
#include <drizzled/show.h>
29
29
#include <drizzled/tztime.h>
30
30
#include <drizzled/sql_base.h>
 
31
#include <drizzled/plugin/client.h>
31
32
 
32
33
#include "info_schema_methods.h"
33
34
 
610
611
      struct st_my_thread_var *mysys_var;
611
612
      const char *val;
612
613
 
613
 
      if (! tmp->protocol->isConnected())
 
614
      if (! tmp->client->isConnected())
614
615
        continue;
615
616
 
616
617
      table->restoreRecordAsDefault();
640
641
      table->field[5]->store((uint32_t)(tmp->start_time ?
641
642
                                      now - tmp->start_time : 0), true);
642
643
      /* STATE */
643
 
      val= (char*) (tmp->protocol->isWriting() ?
 
644
      val= (char*) (tmp->client->isWriting() ?
644
645
                    "Writing to net" :
645
 
                    tmp->protocol->isReading() ?
 
646
                    tmp->client->isReading() ?
646
647
                    (tmp->command == COM_SLEEP ?
647
648
                     NULL : "Reading from net") :
648
649
                    tmp->get_proc_info() ? tmp->get_proc_info() :
1104
1105
    Table *show_table= tables->table;
1105
1106
    TableShare *share= show_table->s;
1106
1107
    handler *file= show_table->file;
1107
 
    StorageEngine *tmp_db_type= share->db_type();
 
1108
    drizzled::plugin::StorageEngine *tmp_db_type= share->db_type();
1108
1109
 
1109
1110
    if (share->tmp_table == SYSTEM_TMP_TABLE)
1110
1111
    {