← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/table_function.cc

  • Committer: Lee Bieber
  • Date: 2010-12-13 20:50:56 UTC
  • mfrom: (1993.2.3 build)
  • Revision ID: kalebral@gmail.com-20101213205056-rkzi5ve3hc0mpnws
Merge Andrew - fix bug 686773: TableFunction::Generator::push() needs assert
Merge Stewart - ON DUPLICATE KEY UPDATE support for HailDB
Merge Monty - fix bug 688819: drizzle fails to build from source in natty 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/table_function.cc
202
202
 
203
203
void plugin::TableFunction::Generator::push()
204
204
{
205
 
#if 0 // @note this needs to be rewritten such that a drizzled::Field object can determine if it should ever be null
206
 
  assert((*columns_iterator)->getTable()->getShare()->getTableProto()->field((*columns_iterator)->getTable()->getFields() - columns_iterator).constraints().is_nullable());
207
 
#endif
 
205
  /* Only accept NULLs */
 
206
  assert((*columns_iterator)->maybe_null());
208
207
  (*columns_iterator)->set_null();
209
208
  columns_iterator++;
210
209
}