← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/row/row0merge.c

  • Committer: lbieber
  • Date: 2010-10-08 01:11:05 UTC
  • mfrom: (1821.1.4 build)
  • Revision ID: lbieber@orisndriz08-20101008011105-1tbwbvz9me9fy7ua
Merge Monty - Fixed the last of the ICC warnings. Turned on warnings=errors
Merge Brian - fixu bug #655558: SELECT 102/(1-1) should error on divide by zero          
Merge Brian - fix bug #654219: information_schema.key_column_usage does not contain information about FKs

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/row/row0merge.c
1216
1216
                                        if (dfield_is_null(field)) {
1217
1217
                                                err = DB_PRIMARY_KEY_IS_NULL;
1218
1218
                                                i = 0;
1219
 
                                                goto err_exit;
 
1219
                                                trx->error_key_num = i;
 
1220
                                                goto func_exit;
1220
1221
                                        }
1221
1222
 
1222
1223
                                        field_type->prtype |= DATA_NOT_NULL;