~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

Committer: Brian Aker
Date: 2009-09-21 23:40:18 UTC
mfrom: (1039.5.63 replication)
Revision ID: brian@gaz-20090921234018-gd9kqdyigwxtik9z

Merge Jay

files added:
drizzled/plugin/command_reader.h

plugin/command_log/command_log_reader.cc

plugin/command_log/command_log_reader.h

plugin/filtered_replicator

plugin/filtered_replicator/filtered_replicator.cc

plugin/filtered_replicator/filtered_replicator.h

plugin/filtered_replicator/plugin.ini

tests/suite/command_log/r/alter.result

tests/suite/command_log/r/database.result

tests/suite/command_log/r/delete.result

tests/suite/command_log/r/insert.result

tests/suite/command_log/r/insert_multi.result

tests/suite/command_log/r/insert_select.result

tests/suite/command_log/r/rename.result

tests/suite/command_log/r/truncate_log.result

tests/suite/command_log/r/update.result

tests/suite/command_log/t/alter-master.opt

tests/suite/command_log/t/alter.test

tests/suite/command_log/t/database-master.opt

tests/suite/command_log/t/database.test

tests/suite/command_log/t/delete-master.opt

tests/suite/command_log/t/delete.test

tests/suite/command_log/t/insert-master.opt

tests/suite/command_log/t/insert.test

tests/suite/command_log/t/insert_multi-master.opt

tests/suite/command_log/t/insert_multi.test

tests/suite/command_log/t/insert_select-master.opt

tests/suite/command_log/t/insert_select.inc

tests/suite/command_log/t/insert_select.test

tests/suite/command_log/t/rename-master.opt

tests/suite/command_log/t/rename.test

tests/suite/command_log/t/truncate-master.opt

tests/suite/command_log/t/truncate_log-master.opt

tests/suite/command_log/t/truncate_log.test

tests/suite/command_log/t/update-master.opt

tests/suite/command_log/t/update.inc

tests/suite/command_log/t/update.test

files renamed:
drizzled/plugin/applier.h => drizzled/plugin/command_applier.h

drizzled/plugin/replicator.h => drizzled/plugin/command_replicator.h

tests/suite/command_log/r/all.result => tests/suite/command_log/r/filtered_replicator.result

tests/suite/command_log/t/all-master.opt => tests/suite/command_log/t/filtered_replicator-master.opt

tests/suite/command_log/t/all.test => tests/suite/command_log/t/filtered_replicator.test

tests/suite/command_log/t/multi_insert.inc => tests/suite/command_log/t/insert_multi.inc

files modified:
.bzrignore

drizzled/Makefile.am

drizzled/field.cc

drizzled/message/command_reader.cc

drizzled/message/replication.proto

drizzled/plugin/registry.cc

drizzled/plugin/registry.h

drizzled/replication_services.cc

drizzled/replication_services.h

drizzled/session.cc

drizzled/session.h

drizzled/table.h

plugin/command_log/command_log.cc

plugin/command_log/command_log.h

plugin/command_log/plugin.ini

plugin/default_replicator/default_replicator.cc

plugin/default_replicator/default_replicator.h

po/ar.po

po/ca.po

po/cs.po

po/cy.po

Show diffs side-by-side

added added

removed removed

drizzled/session.cc

1733

}

1734

1735

/**

1736

Return the thread id of a user thread

1737

@param session user thread

1738

@return thread id

1736

Return the session id of a user session

1737

@param pointer to Session object

1738

@return session's id

1739

1740

extern "C" unsigned long session_get_thread_id(const Session *session)

1741

{

1742

return((unsigned long)session->thread_id);

1742

return (unsigned long) session->getSessionId();

1743

}

1744

1745

Older »