← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/concurrent.cc

  • Committer: Lee Bieber
  • Date: 2011-01-15 03:08:27 UTC
  • mfrom: (1994.5.38 doc)
  • mto: This revision was merged to the branch mainline in revision 2087.
  • Revision ID: kalebral@gmail.com-20110115030827-0h9s99kiknrmt9ti
Merge Stewart - some documentation clean up

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/concurrent.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
 
23
23
#include <sys/types.h>
24
24
#include <sys/stat.h>
25
25
#include <fcntl.h>
26
26
 
27
 
#include <drizzled/session.h>
28
 
#include <plugin/myisam/myisam.h>
29
 
#include <drizzled/plugin/transactional_storage_engine.h>
 
27
#include "drizzled/session.h"
 
28
#include "plugin/myisam/myisam.h"
 
29
#include "drizzled/plugin/transactional_storage_engine.h"
30
30
 
31
31
#include <drizzled/table/instance.h>
32
32
 
33
 
#include <drizzled/table.h>
 
33
#include "drizzled/table.h"
34
34
 
35
35
namespace drizzled
36
36
{
68
68
  if (session->getKilled())
69
69
    return true;
70
70
 
71
 
  identifier::Table identifier(table_list->getSchemaName(), table_list->getTableName());
 
71
  TableIdentifier identifier(table_list->getSchemaName(), table_list->getTableName());
72
72
  if (open_unireg_entry(session, table_list->getTableName(), identifier))
73
73
  {
74
74
    intern_close_table();
121
121
 
122
122
int table::Concurrent::open_unireg_entry(Session *session,
123
123
                                         const char *alias,
124
 
                                         identifier::Table &identifier)
 
124
                                         TableIdentifier &identifier)
125
125
{
126
126
  int error;
127
127
  TableShare::shared_ptr share;