← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

Merged Eric from lp:~eday/drizzle/eday-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
37
37
#include <algorithm>
38
38
 
39
39
using namespace std;
 
40
using namespace drizzled;
40
41
extern drizzled::ReplicationServices replication_services;
41
42
 
42
43
static const char hexchars[]= "0123456789abcdef";
2180
2181
  Select_Lex *select= &session->lex->select_lex;
2181
2182
  List<Item> field_list;
2182
2183
  Item *item;
2183
 
  Protocol *protocol= session->protocol;
 
2184
  plugin::Protocol *protocol= session->protocol;
2184
2185
  LEX *lex= session->lex;
2185
2186
  int result_code= 0;
2186
2187
  const CHARSET_INFO * const cs= system_charset_info;
2197
2198
  item->maybe_null = 1;
2198
2199
  field_list.push_back(item = new Item_empty_string("Msg_text", 255, cs));
2199
2200
  item->maybe_null = 1;
2200
 
  if (protocol->sendFields(&field_list,
2201
 
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
2202
 
    return(true);
 
2201
  if (protocol->sendFields(&field_list))
 
2202
    return true;
2203
2203
 
2204
2204
  for (table= tables; table; table= table->next_local)
2205
2205
  {
3952
3952
    snprintf(tmp_name, sizeof(tmp_name), ER(ER_INSERT_INFO),
3953
3953
            (ulong) (copied + deleted), (ulong) deleted,
3954
3954
            (ulong) session->cuted_fields);
3955
 
    session->my_ok(copied + deleted, 0L, tmp_name);
 
3955
    session->my_ok(copied + deleted, 0, 0L, tmp_name);
3956
3956
    session->some_tables_deleted=0;
3957
3957
    return false;
3958
3958
  }
4276
4276
  TableList *table;
4277
4277
  List<Item> field_list;
4278
4278
  Item *item;
4279
 
  Protocol *protocol= session->protocol;
 
4279
  plugin::Protocol *protocol= session->protocol;
4280
4280
 
4281
4281
  field_list.push_back(item = new Item_empty_string("Table", NAME_LEN*2));
4282
4282
  item->maybe_null= 1;
4283
4283
  field_list.push_back(item= new Item_int("Checksum", (int64_t) 1,
4284
4284
                                          MY_INT64_NUM_DECIMAL_DIGITS));
4285
4285
  item->maybe_null= 1;
4286
 
  if (protocol->sendFields(&field_list,
4287
 
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
4288
 
    return(true);
 
4286
  if (protocol->sendFields(&field_list))
 
4287
    return true;
4289
4288
 
4290
4289
  /* Open one table after the other to keep lock time as short as possible. */
4291
4290
  for (table= tables; table; table= table->next_local)