~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

Committer: Brian Aker
Date: 2009-05-20 23:51:08 UTC
mfrom: (1022.2.18 mordred)
Revision ID: brian@gaz-20090520235108-nb5he1em112798pb

Merge Monty

files added:
tests/suite/csv

tests/suite/csv/r

tests/suite/csv/t

tests/suite/hello_world

tests/suite/hello_world/r

tests/suite/hello_world/r/hello_world.result

tests/suite/hello_world/t

tests/suite/hello_world/t/hello_world.test

files removed:
tests/include/big_test.inc

tests/r/big_test.require

files renamed:
tests/r/csv.result => tests/suite/csv/r/csv.result

tests/r/csv_alter_table.result => tests/suite/csv/r/csv_alter_table.result

tests/r/csv_not_null.result => tests/suite/csv/r/csv_not_null.result

tests/t/csv.test => tests/suite/csv/t/csv.test

tests/t/csv_alter_table.test => tests/suite/csv/t/csv_alter_table.test

tests/t/csv_not_null.test => tests/suite/csv/t/csv_not_null.test

files modified:
configure.ac

drizzled/drizzled.cc

drizzled/message/binary_log.cc

drizzled/server_includes.h

drizzled/session.h

drizzled/show.cc

drizzled/sql_parse.cc

drizzled/sql_plugin.cc

plugin/auth_pam/plugin.ac

plugin/md5/md5.cc

plugin/md5/plugin.ac

plugin/signal_handler/signal_handler.cc

po/ar.po

po/ca.po

po/cs.po

po/cy.po

po/de.po

po/drizzle.pot

po/el.po

po/en_AU.po

po/en_GB.po

po/eo.po

po/es.po

po/fr.po

po/he.po

po/hi.po

po/id.po

po/it.po

po/ja.po

po/ko.po

po/ml.po

po/mr.po

po/ms.po

po/nb.po

po/nl.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/sv.po

po/ta.po

po/tr.po

po/zh_CN.po

po/zh_HK.po

tests/Makefile.am

tests/lib/mtr_cases.pl

tests/suite/big/t/archive-big.test

tests/suite/big/t/concurrent_innodb.test

tests/suite/big/t/read_many_rows_innodb.test

tests/suite/big/t/sum_distinct-big.test

tests/suite/big/t/variables-big.test

tests/test-run.pl

Show diffs side-by-side

added added

removed removed

drizzled/sql_parse.cc

2559

static unsigned int

2560

kill_one_thread(Session *, ulong id, bool only_kill_query)

2561

{

2562

Session *tmp;

2562

Session *tmp= NULL;

2563

uint32_t error=ER_NO_SUCH_THREAD;

2564

pthread_mutex_lock(&LOCK_thread_count); // For unlink from list

2565

I_List_iterator<Session> it(session_list);

2566

while ((tmp=it++))

2565

2566

for( vector<Session*>::iterator it= session_list.begin(); it != session_list.end(); ++it )

2567

{

2568

if (tmp->thread_id == id)

2568

if ((*it)->thread_id == id)

2569

{

2570

tmp= *it;

2570

2571

pthread_mutex_lock(&tmp->LOCK_delete); // Lock from delete

2571

2572

break;

2572

2573

}

Older »