← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Monty Taylor
  • Date: 2010-10-07 05:47:20 UTC
  • mto: (1821.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 1822.
  • Revision ID: mordred@inaugust.com-20101007054720-fa9s10o6w0ja301k
Fixed the last. (did I mention the LAST) warning in ICC.
WOO F-ing HOO!!!

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;