← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Monty Taylor
  • Date: 2009-12-23 08:01:21 UTC
  • mto: This revision was merged to the branch mainline in revision 1253.
  • Revision ID: mordred@inaugust.com-20091223080121-iveugdrewkp7iqyi
Oy. Bigger change than I normally like - but this stuff is all intertwined.
Moved a bunch of things to public drizzled/ area. Split some files. Made some
convenience libs. EVENTUALLY, some of this will be able to be re-factored, but
for now I'm ok with erring on the side of too many files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
42
42
#include <drizzled/unireg.h>
43
43
#include <drizzled/message/table.pb.h>
44
44
#include "drizzled/sql_table.h"
 
45
#include "drizzled/charset.h"
45
46
 
46
47
#include <drizzled/item/string.h>
47
48
#include <drizzled/item/int.h>
1211
1212
    free(field_pack_length);
1212
1213
 
1213
1214
  share->error= error;
1214
 
  share->open_errno= my_errno;
 
1215
  share->open_errno= errno;
1215
1216
  share->errarg= 0;
1216
1217
  hash_free(&share->name_hash);
1217
1218
  share->open_table_error(error, share->open_errno, 0);
1263
1264
  {
1264
1265
    if (error>0)
1265
1266
    {
1266
 
      my_errno= error;
 
1267
      errno= error;
1267
1268
      error= 1;
1268
1269
    }
1269
1270
    else
1287
1288
  if (error && !error_given)
1288
1289
  {
1289
1290
    share->error= error;
1290
 
    share->open_table_error(error, (share->open_errno= my_errno), 0);
 
1291
    share->open_table_error(error, (share->open_errno= errno), 0);
1291
1292
  }
1292
1293
 
1293
1294
  return(error);
1494
1495
            as if the .frm cursor didn't exist
1495
1496
          */
1496
1497
          error= 1;
1497
 
          my_errno= ENOENT;
 
1498
          errno= ENOENT;
1498
1499
          break;
1499
1500
        case EMFILE:
1500
1501
          /*
1502
1503
            cursor can't open
1503
1504
           */
1504
1505
          error= 1;
1505
 
          my_errno= EMFILE;
 
1506
          errno= EMFILE;
1506
1507
          break;
1507
1508
        default:
1508
1509
          outparam->print_error(ha_err, MYF(0));
1525
1526
 
1526
1527
 err:
1527
1528
  if (!error_reported && !(prgflag & DONT_GIVE_ERROR))
1528
 
    share->open_table_error(error, my_errno, 0);
 
1529
    share->open_table_error(error, errno, 0);
1529
1530
  delete outparam->cursor;
1530
1531
  outparam->cursor= 0;                          // For easier error checking
1531
1532
  outparam->db_stat= 0;