← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

  • Committer: Stewart Smith
  • Date: 2009-12-02 06:01:21 UTC
  • mto: (1237.1.2 push)
  • mto: This revision was merged to the branch mainline in revision 1238.
  • Revision ID: stewart@flamingspork.com-20091202060121-68gyfqifqcjcmi2v
my_end() no longer requires an argument (we removed them all)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
 
20
#include <drizzled/server_includes.h>
21
21
#include <drizzled/field_iterator.h>
22
22
#include <drizzled/table_list.h>
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/table.h>
25
25
 
26
 
namespace drizzled
27
 
{
28
 
 
29
26
const char *Field_iterator_table::name()
30
27
{
31
28
  return (*ptr)->field_name;
143
140
    Test that TableList::db is the same as TableShare::db to
144
141
    ensure consistency. 
145
142
  */
146
 
  assert(!strcmp(table_ref->db, table_ref->table->s->getSchemaName()));
 
143
  assert(!strcmp(table_ref->db, table_ref->table->s->db.str));
147
144
  return table_ref->db;
148
145
}
149
146
 
284
281
  return nj_col;
285
282
}
286
283
 
287
 
} /* namespace drizzled */