← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

  • Committer: lbieber
  • Date: 2010-10-01 12:16:18 UTC
  • mfrom: (1802.1.1 fix-bug-651256)
  • Revision ID: lbieber@orisndriz08-20101001121618-uqcboygpjwbiglem
Merge Vijay - fix bug 651256 - Remove --help-extended

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
128
128
  if (table_ref->is_natural_join)
129
129
    return natural_join_it.column_ref()->table_name();
130
130
 
131
 
  assert(!strcmp(table_ref->getTableName(),
132
 
                 table_ref->table->getShare()->getTableName()));
133
 
  return table_ref->getTableName();
 
131
  assert(!strcmp(table_ref->table_name,
 
132
                      table_ref->table->getShare()->getTableName()));
 
133
  return table_ref->table_name;
134
134
}
135
135
 
136
136
 
143
143
    Test that TableList::db is the same as TableShare::db to
144
144
    ensure consistency. 
145
145
  */
146
 
  assert(!strcmp(table_ref->getSchemaName(), table_ref->table->getShare()->getSchemaName()));
147
 
  return table_ref->getSchemaName();
 
146
  assert(!strcmp(table_ref->db, table_ref->table->getShare()->getSchemaName()));
 
147
  return table_ref->db;
148
148
}
149
149
 
150
150