← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2010-10-09 17:44:13 UTC
  • mto: This revision was merged to the branch mainline in revision 1853.
  • Revision ID: brian@tangent.org-20101009174413-4cs0q58kw0fjd45y
First pass through adding back user_locks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
1425
1425
*/
1426
1426
 
1427
1427
static unsigned int
1428
 
kill_one_thread(Session *, ulong id, bool only_kill_query)
 
1428
kill_one_thread(Session *, session_id_t id, bool only_kill_query)
1429
1429
{
1430
1430
  Session *tmp= NULL;
1431
1431
  uint32_t error= ER_NO_SUCH_THREAD;
1466
1466
    only_kill_query     Should it kill the query or the connection
1467
1467
*/
1468
1468
 
1469
 
void sql_kill(Session *session, ulong id, bool only_kill_query)
 
1469
void sql_kill(Session *session, int64_t id, bool only_kill_query)
1470
1470
{
1471
1471
  uint32_t error;
1472
1472
  if (!(error= kill_one_thread(session, id, only_kill_query)))