← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_error.cc

  • Committer: Andrew Hutchings
  • Date: 2010-11-01 22:04:06 UTC
  • mfrom: (1897 merge)
  • mto: This revision was merged to the branch mainline in revision 1907.
  • Revision ID: andrew@linuxjedi.co.uk-20101101220406-nj6i29uzja17u1hn
Merge trunk into branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_error.cc
134
134
 
135
135
    session->no_warnings_for_error= 1;
136
136
 
137
 
    session->setKilled(Session::KILL_BAD_DATA);
 
137
    session->killed= Session::KILL_BAD_DATA;
138
138
    my_message(code, msg, MYF(0));
139
139
 
140
140
    session->no_warnings_for_error= no_warnings_for_error;