← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2009-08-11 20:22:59 UTC
  • mfrom: (1093.1.59 captain)
  • Revision ID: brian@gaz-20090811202259-5a92huu2yqmzdx1u
MErge Jay

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
  {
3977
3977
    snprintf(tmp_name, sizeof(tmp_name), ER(ER_INSERT_INFO),
3978
3978
            (ulong) (copied + deleted), (ulong) deleted,
3979
3979
            (ulong) session->cuted_fields);
3980
 
    session->my_ok(copied + deleted, 0L, tmp_name);
 
3980
    session->my_ok(copied + deleted, 0, 0L, tmp_name);
3981
3981
    session->some_tables_deleted=0;
3982
3982
    return false;
3983
3983
  }
4301
4301
  TableList *table;
4302
4302
  List<Item> field_list;
4303
4303
  Item *item;
4304
 
  Protocol *protocol= session->protocol;
 
4304
  plugin::Protocol *protocol= session->protocol;
4305
4305
 
4306
4306
  field_list.push_back(item = new Item_empty_string("Table", NAME_LEN*2));
4307
4307
  item->maybe_null= 1;
4308
4308
  field_list.push_back(item= new Item_int("Checksum", (int64_t) 1,
4309
4309
                                          MY_INT64_NUM_DECIMAL_DIGITS));
4310
4310
  item->maybe_null= 1;
4311
 
  if (protocol->sendFields(&field_list,
4312
 
                           Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
4313
 
    return(true);
 
4311
  if (protocol->sendFields(&field_list))
 
4312
    return true;
4314
4313
 
4315
4314
  /* Open one table after the other to keep lock time as short as possible. */
4316
4315
  for (table= tables; table; table= table->next_local)