← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/csv/ha_tina.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/csv/ha_tina.cc
47
47
#include <drizzled/error.h>
48
48
#include <drizzled/table.h>
49
49
#include <drizzled/session.h>
 
50
#include "drizzled/internal/my_sys.h"
50
51
 
51
52
#include "ha_tina.h"
52
53
 
145
146
                           drizzled::message::Table *table_proto);
146
147
 
147
148
  /* Temp only engine, so do not return values. */
148
 
  void doGetTableNames(CachedDirectory &, string& , set<string>&) { };
 
149
  void doGetTableNames(drizzled::CachedDirectory &, string& , set<string>&) { };
149
150
 
150
151
  int doDropTable(Session&, const string table_path);
151
152
  TinaShare *findOpenTable(const string table_name);
172
173
              MY_UNPACK_FILENAME|MY_APPEND_EXT);
173
174
    if (my_delete_with_symlink(buff, MYF(0)))
174
175
    {
175
 
      if ((error= my_errno) != ENOENT)
 
176
      if ((error= errno) != ENOENT)
176
177
        break;
177
178
    }
178
179
    else
1359
1360
  int rc;
1360
1361
 
1361
1362
  if (!records_is_known)
1362
 
    return(my_errno=HA_ERR_WRONG_COMMAND);
 
1363
    return(errno=HA_ERR_WRONG_COMMAND);
1363
1364
 
1364
1365
  if (!share->tina_write_opened)
1365
1366
    if (init_tina_writer())