Module: sip-router Branch: janakj/flatstore Commit: abae24ebc3d01400a6819c629776d4b37ecdeb48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abae24eb...

Author: Jan Janak jan@iptel.org Committer: Jan Janak jan@iptel.org Date: Tue Feb 17 14:47:59 2009 +0100

Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into flatstore

* 'master' of ssh://janakj@git.sip-router.org/sip-router: (194 commits) Support for db driver names with "db_" prefix in libsrdb2. Make sure mod_init from kamailio/db_mysql is called. Export kamailio/db_mysql parameters through the module api. Export db_bind_api through the module interface. Eliminate conflicts with files imported from ser/mysql modules. DB_* renamed to DB1_* in files originating from kamailio/db_mysql. db_res renamed to db1_res in files originating from kamailio/db_mysql. db_con renamed to db1_con in files originating from kamailio/db_mysql. Integration of both modules, first step. Module name changed to db_mysql. Changes necessary to make the module compile in the sip-router tree. - fixed auto_reconnect c&p error - add one DBG log to each drivers error condition, that the mem is freed - fix one DBG msg (still using module prefix), two small indention fixes - partial revert of commit rev5359 for db_mysql module - add group functionality to read content from specified sections - unify common rows and row allocation functionality in the DB API core - change behaviour of db_str2val, this now copy strings - move db_mysql and db_unixodbc str2val implementation to the DB core, - fix a few errors in doxygen documentation ...

---