← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_list.cc

  • Committer: lbieber
  • Date: 2010-10-06 16:34:16 UTC
  • mfrom: (1816.1.3 build)
  • Revision ID: lbieber@orisndriz08-20101006163416-ea0sl59qgpglk21y
Merge Monty - Change the requirement from either libinnodb to libhaildb. Also, tied it to version 2.2
Merge Andrew - fix bug 650935: remove --compress from all clients
Merge Andrew - fix bug 653471: Add -A to drizzle client
Merge Travis - 621861 = To change C structs to C++ classes in Drizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_list.cc
1
 
/* Copyright (C) 2009 Sun Microsystems, Inc.
 
1
/* Copyright (C) 2009 Sun Microsystems
2
2
 
3
3
  This program is free software; you can redistribute it and/or modify
4
4
  it under the terms of the GNU General Public License as published by
34
34
class Item;
35
35
class Item_field;
36
36
 
 
37
uint32_t TableList::create_table_def_key(char *key)
 
38
{
 
39
  return TableIdentifier::createKey(key, db, table_name);
 
40
}
 
41
 
37
42
bool TableList::set_insert_values(memory::Root *)
38
43
{
39
44
  if (table)
76
81
TableList *TableList::last_leaf_for_name_resolution()
77
82
{
78
83
  TableList *cur_table_ref= this;
79
 
  NestedJoin *cur_nested_join;
 
84
  nested_join_st *cur_nested_join;
80
85
 
81
86
  if (is_leaf_for_name_resolution())
82
87
    return this;
114
119
TableList *TableList::first_leaf_for_name_resolution()
115
120
{
116
121
  TableList *cur_table_ref= NULL;
117
 
  NestedJoin *cur_nested_join;
 
122
  nested_join_st *cur_nested_join;
118
123
 
119
124
  if (is_leaf_for_name_resolution())
120
125
    return this;