sr-dev

sr-dev@lists.kamailio.org

12 participants
44199 discussions

git:janakj/mysql: - partial revert of commit rev5359 for db_mysql module

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: f62841030ed319fbf02848cb5088f789ca7b6893 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f628410… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 18:29:35 2009 +0000 - partial revert of commit rev5359 for db_mysql module - generalize db_str2val function in the DB API core, the string copying behaviour can now configured (its done for db_postgres, db_unixodbc, not done for db_mysql like in the 1.3, 1.4 branches) - still TODO: fix NULL case in db_unixodbc, try to fix double copying git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5423 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_row.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_row.c b/modules/db_mysql/km_row.c index 29f39f1..b44068a 100644 --- a/modules/db_mysql/km_row.c +++ b/modules/db_mysql/km_row.c @@ -63,7 +63,7 @@ int db_mysql_convert_row(const db_con_t* _h, db_res_t* _res, db_row_t* _r) for(i = 0; i < RES_COL_N(_res); i++) { if (db_str2val(RES_TYPES(_res)[i], &(ROW_VALUES(_r)[i]), - ((MYSQL_ROW)CON_ROW(_h))[i], lengths[i]) < 0) { + ((MYSQL_ROW)CON_ROW(_h))[i], lengths[i], 0) < 0) { LM_ERR("failed to convert value\n"); LM_DBG("free row at %p\n", _r); db_free_row(_r);

15 years, 10 months

git:janakj/mysql: - add group functionality to read content from specified sections

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 89215f17a700df083e99f16e58becb3d2ab28f0b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89215f1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 5 12:27:49 2009 +0000 - add group functionality to read content from specified sections of the mysql config to the db_mysql module, db_url examples: * mysql://user:pass@[group]host:port/db or * mysql://user:pass@[group]/db or * mysql://[group]/db - existing functionality is not changed, this is backward compatible - check usernames for NULL before comparing in DB API, otherwise it would segfault when only a group name is specified - patch from Andreas Granig, agranig at sipwise dot com, closes #1815631 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5413 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_README | 51 ++++++++++++++++++++++++++ modules/db_mysql/km_doc/db_mysql_admin.xml | 54 ++++++++++++++++++++++++++++ modules/db_mysql/km_my_con.c | 28 ++++++++++++-- 3 files changed, 129 insertions(+), 4 deletions(-) diff --git a/modules/db_mysql/km_README b/modules/db_mysql/km_README index 54951d1..eb7693c 100644 --- a/modules/db_mysql/km_README +++ b/modules/db_mysql/km_README @@ -34,12 +34,16 @@ Daniel-Constantin Mierla 1.4. Exported Functions 1.5. Installation + 1.6. Reading configuration from my.cnf List of Examples 1.1. Set ping_interval parameter 1.2. Set timeout_interval parameter 1.3. Set auto_reconnect parameter + 1.4. Set a my.cnf group in db_url parameter + 1.5. Adding a kamailio group to my.cnf + 1.6. Using [client] and specific group Chapter 1. Admin Guide @@ -121,3 +125,50 @@ modparam("auto_reconnect", "auto_reconnect", 0) * - from command line use: 'make all include_modules="db_mysql"; make install include_modules="db_mysql"'. + +1.6. Reading configuration from my.cnf + + In order to take into account specific mysql client options, a + my.cnf config group can be passed using the db_url module + parameter. This is done by setting [group] in front of or + instead of the host part. The following examples are valid + db_url definitions, which include a my.cnf group: + * mysql://user:pass@[group]host:port/db + * mysql://user:pass@[group]:port/db + * mysql://user:pass@[group]/db + * mysql://[group]/db + + Example 1.4. Set a my.cnf group in db_url parameter +... +modparam("usrloc", "db_url", "mysql://[kamailio]/kamailio) +... + + Example 1.5. Adding a kamailio group to my.cnf +... +[kamailio] +socket = /path/to/mysql.sock +user = kamailiouser +password = kamailiopass +default-character-set = utf8 +... + + In addition to the given group, also the [client] section is + read, in the order given in my.cnf. So if you for example + specify a socket in both your specific group and the client + group, then the value is taken from the last one. + + Example 1.6. Using [client] and specific group +... +[client] +socket = /var/run/mysql/mysqld.sock + +[kamailio] +socket = /path/to/mysqld.sock +user = kamailiouser +password = kamailiopass +default-character-set = utf8 +... + + In the example given above, the socket /path/to/mysqld.sock is + used by Kamailio because both [kamailio] and [client] define + this option, and the latter overwrites the first. diff --git a/modules/db_mysql/km_doc/db_mysql_admin.xml b/modules/db_mysql/km_doc/db_mysql_admin.xml index 31079e0..a484d02 100644 --- a/modules/db_mysql/km_doc/db_mysql_admin.xml +++ b/modules/db_mysql/km_doc/db_mysql_admin.xml @@ -140,5 +140,59 @@ modparam("auto_reconnect", "auto_reconnect", 0) </listitem> </itemizedlist> </section> + <section> + <title>Reading configuration from my.cnf</title> + <para> + In order to take into account specific mysql client options, a my.cnf config group can be passed using the <emphasis>db_url</emphasis> module parameter. This is done by setting <emphasis>[group]</emphasis> in front of or instead of the host part. The following examples are valid <emphasis>db_url</emphasis> definitions, which include a my.cnf group: + </para> + + <itemizedlist> + <listitem>mysql://user:pass@[group]host:port/db</listitem> + <listitem>mysql://user:pass@[group]:port/db</listitem> + <listitem>mysql://user:pass@[group]/db</listitem> + <listitem>mysql://[group]/db</listitem> + </itemizedlist> + <example> + <title>Set a my.cnf group in <varname>db_url</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "db_url", "mysql://[kamailio]/kamailio) +... +</programlisting> + </example> + <example> + <title>Adding a kamailio group to my.cnf</title> + <programlisting format="linespecific"> +... +[kamailio] +socket = /path/to/mysql.sock +user = kamailiouser +password = kamailiopass +default-character-set = utf8 +... +</programlisting> + </example> + <para> + In addition to the given group, also the <emphasis>[client]</emphasis> section is read, in the order given in my.cnf. So if you for example specify a <emphasis>socket</emphasis> in both your specific group and the client group, then the value is taken from the last one. + </para> + <example> + <title>Using [client] and specific group</title> + <programlisting format="linespecific"> +... +[client] +socket = /var/run/mysql/mysqld.sock + +[kamailio] +socket = /path/to/mysqld.sock +user = kamailiouser +password = kamailiopass +default-character-set = utf8 +... +</programlisting> + </example> + <para> + In the example given above, the socket <emphasis>/path/to/mysqld.sock</emphasis> is used by &kamailio; because both <emphasis>[kamailio]</emphasis> and <emphasis>[client]</emphasis> define this option, and the latter overwrites the first. + </para> + </section> </chapter> diff --git a/modules/db_mysql/km_my_con.c b/modules/db_mysql/km_my_con.c index 1a907b9..b5ec56a 100644 --- a/modules/db_mysql/km_my_con.c +++ b/modules/db_mysql/km_my_con.c @@ -43,6 +43,7 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) { struct my_con* ptr; + char *host, *grp; if (!id) { LM_ERR("invalid parameter value\n"); @@ -66,11 +67,30 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_init(ptr->con); + if (id->host[0] == '[' && (host = strchr(id->host, ']')) != NULL) { + grp = id->host + 1; + *host = '\0'; + if (host != id->host + strlen(id->host)-1) { + host += 1; // host found after closing bracket + } + else { + // let mysql read host info from my.cnf + // (defaults to "localhost") + host = NULL; + } + // read [client] and [<grp>] sections in the order + // given in my.cnf + mysql_options(ptr->con, MYSQL_READ_DEFAULT_GROUP, grp); + } + else { + host = id->host; + } + if (id->port) { - LM_DBG("opening connection: mysql://xxxx:xxxx@%s:%d/%s\n", ZSW(id->host), + LM_DBG("opening connection: mysql://xxxx:xxxx@%s:%d/%s\n", ZSW(host), id->port, ZSW(id->database)); } else { - LM_DBG("opening connection: mysql://xxxx:xxxx@%s/%s\n", ZSW(id->host), + LM_DBG("opening connection: mysql://xxxx:xxxx@%s/%s\n", ZSW(host), ZSW(id->database)); } @@ -80,10 +100,10 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const char *)&db_mysql_timeout_interval); #if (MYSQL_VERSION_ID >= 40100) - if (!mysql_real_connect(ptr->con, id->host, id->username, id->password, + if (!mysql_real_connect(ptr->con, host, id->username, id->password, id->database, id->port, 0, CLIENT_MULTI_STATEMENTS)) { #else - if (!mysql_real_connect(ptr->con, id->host, id->username, id->password, + if (!mysql_real_connect(ptr->con, host, id->username, id->password, id->database, id->port, 0, 0)) { #endif LM_ERR("driver error: %s\n", mysql_error(ptr->con));

15 years, 10 months

git:janakj/mysql: - fix one DBG msg (still using module prefix), two small indention fixes

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 50e2150dc42b128451889025f70fa81709388892 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50e2150… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 7 08:43:22 2009 +0000 - fix one DBG msg (still using module prefix), two small indention fixes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5425 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_db_mysql.c | 4 ++-- modules/db_mysql/km_dbase.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 1b1e778..d1e9e09 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -96,7 +96,7 @@ struct module_exports exports = { static int mysql_mod_init(void) { - LM_DBG("mysql: MySQL client version is %s\n", mysql_get_client_info()); + LM_DBG("MySQL client version is %s\n", mysql_get_client_info()); return 0; } @@ -115,7 +115,7 @@ int db_mysql_bind_api(db_func_t *dbb) dbb->raw_query = db_mysql_raw_query; dbb->free_result = db_mysql_free_result; dbb->insert = db_mysql_insert; - dbb->delete = db_mysql_delete; + dbb->delete = db_mysql_delete; dbb->update = db_mysql_update; dbb->replace = db_mysql_replace; dbb->last_inserted_id = db_last_inserted_id; diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index 506bb0d..68d47b3 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -104,7 +104,7 @@ int db_mysql_update(const db_con_t* _h, const db_key_t* _k, const db_op_t* _o, /*! \brief * Just like insert, but replace the row if it exists */ -int db_mysql_replace(const db_con_t* handle, const db_key_t* keys, const db_val_t* vals, const int n); +int db_mysql_replace(const db_con_t* handle, const db_key_t* keys, const db_val_t* vals, const int n); /*! \brief * Returns the last inserted ID

15 years, 10 months

git:janakj/mysql: - add one DBG log to each drivers error condition, that the mem is freed

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: d26ebfbb0c1a2c000fd57e2c9eec93e89a4a12cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d26ebfb… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 7 14:46:10 2009 +0000 - add one DBG log to each drivers error condition, that the mem is freed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5431 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_dbase.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index ecc3106..ed79a17 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -178,6 +178,7 @@ static int db_mysql_store_result(const db_con_t* _h, db_res_t** _r) if (db_mysql_convert_result(_h, *_r) < 0) { LM_ERR("error while converting result\n"); + LM_DBG("freeing result set at %p\n", _r); pkg_free(*_r); *_r = 0; /* all mem on openser API side is already freed by

15 years, 10 months

git:janakj/mysql: - fixed auto_reconnect c&p error

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 74f98d3161ed96afff958d48009fb4d7c74b2760 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74f98d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Feb 10 20:59:58 2009 +0000 - fixed auto_reconnect c&p error git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5583 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_README | 5 +---- modules/db_mysql/km_doc/db_mysql.xml | 6 ------ modules/db_mysql/km_doc/db_mysql_admin.xml | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/db_mysql/km_README b/modules/db_mysql/km_README index eb7693c..4ea1b32 100644 --- a/modules/db_mysql/km_README +++ b/modules/db_mysql/km_README @@ -11,9 +11,6 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> Copyright � 2006 voice-system.ro - Revision History - Revision $Revision$ $Date: 2008-08-06 12:08:33 +0200 - (Mi, 06 Aug 2008) $ __________________________________________________________ Table of Contents @@ -107,7 +104,7 @@ modparam("db_mysql", "timeout_interval", 2) Example 1.3. Set auto_reconnect parameter ... -modparam("auto_reconnect", "auto_reconnect", 0) +modparam("db_mysql", "auto_reconnect", 0) ... 1.4. Exported Functions diff --git a/modules/db_mysql/km_doc/db_mysql.xml b/modules/db_mysql/km_doc/db_mysql.xml index 92c1623..0659c95 100644 --- a/modules/db_mysql/km_doc/db_mysql.xml +++ b/modules/db_mysql/km_doc/db_mysql.xml @@ -32,12 +32,6 @@ <year>2006</year> <holder>&voicesystem;</holder> </copyright> - <revhistory> - <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> - </revision> - </revhistory> </bookinfo> <toc></toc> diff --git a/modules/db_mysql/km_doc/db_mysql_admin.xml b/modules/db_mysql/km_doc/db_mysql_admin.xml index a484d02..649a638 100644 --- a/modules/db_mysql/km_doc/db_mysql_admin.xml +++ b/modules/db_mysql/km_doc/db_mysql_admin.xml @@ -106,7 +106,7 @@ modparam("db_mysql", "timeout_interval", 2) <title>Set <varname>auto_reconnect</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("auto_reconnect", "auto_reconnect", 0) +modparam("db_mysql", "auto_reconnect", 0) ... </programlisting> </example>

15 years, 10 months

git:janakj/mysql: Merge of kamaililo db_mysql module history into the sip-router tree.

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 0ba587f8e2d3d718f92ed111202657cdfa9a58ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ba587f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Feb 16 21:54:06 2009 +0100 Merge of kamaililo db_mysql module history into the sip-router tree. This is a merge of the full history of the kamailio db_mysql module into the git tree of the sip-router project. The purpose of the merge is to preserve full history from kamailio svn also in the git repository. The module db_mysql already exists in the sip-router tree, it contains the sources merged from SER cvs (so called version 2 of the module). To avoid file conflicts we renamed all files that have been imported from kamailio svn and they are prefixed with km_. Further integration with existing db_mysql module will be commited on top of this merge. * my_filtered: (45 commits) - 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 - add a comment about the NULL value behaviour of libmysql - docs extension: explain fetch_result functionality better to prevent errors - remove not reached return statement at the end of val2str functions - initial support for BIGINT database in DB core and SQL based database - evaluate DECIMAL (and NEW_DECIMAL) type a DB_STRING, and not DB_INT - fixed compile error - MYSQL_TYPE_NEWDECIMAL date type is supported - fix link entity names, patch from Carsten Gross - port from opensips r4526, credits goes to bogdan - regenerated all READMEs (make modules-readme exclude_modules="") - renaming: changed entities in documentation - renaming: openser -> kamailio ... ---

15 years, 10 months

git:janakj/mysql: - some synchronisations with db_postgres driver

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: bcdd7e786876b4cce49fb0fdea56ec696caa77cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcdd7e7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 8 16:12:31 2008 +0000 - some synchronisations with db_postgres driver - move LAST_ROW incrementation to the end of the function, to only update after a successfull fetch - add two debug messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4138 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_dbase.c | 7 ++++++- modules/db_mysql/km_res.c | 1 + 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 1da7953..e4f78ba 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -323,9 +323,11 @@ int db_mysql_fetch_result(const db_con_t* _h, db_res_t** _r, const int nrows) if(nrows < rows) rows = nrows; - RES_LAST_ROW(*_r) += rows; RES_ROW_N(*_r) = rows; + LM_DBG("converting row %d of %d count %d\n", RES_LAST_ROW(*_r), + RES_NUM_ROWS(*_r), RES_ROW_N(*_r)); + RES_ROWS(*_r) = (struct db_row*)pkg_malloc(sizeof(db_row_t) * rows); if (!RES_ROWS(*_r)) { LM_ERR("no memory left\n"); @@ -347,6 +349,9 @@ int db_mysql_fetch_result(const db_con_t* _h, db_res_t** _r, const int nrows) return -7; } } + + /* update the total number of rows processed */ + RES_LAST_ROW(*_r) += rows; return 0; } diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 91a8211..740b254 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -144,6 +144,7 @@ static inline int db_mysql_convert_rows(const db_con_t* _h, db_res_t* _r) RES_ROW_N(_r) = mysql_num_rows(CON_RESULT(_h)); if (!RES_ROW_N(_r)) { + LM_DBG("no rows returned from the query\n"); RES_ROWS(_r) = 0; return 0; }

15 years, 10 months

git:janakj/mysql: - add a few missing '\n' to log messages

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 03018e87b81f8bc668f5205f8779fd01f837d004 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03018e8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri May 9 15:50:17 2008 +0000 - add a few missing '\n' to log messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4149 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_res.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 740b254..7c9812b 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -56,7 +56,7 @@ int db_mysql_get_columns(const db_con_t* _h, db_res_t* _r) } if (db_allocate_columns(_r, RES_COL_N(_r)) != 0) { - LM_ERR("could not allocate columns"); + LM_ERR("could not allocate columns\n"); return -3; } @@ -87,34 +87,34 @@ int db_mysql_get_columns(const db_con_t* _h, db_res_t* _r) case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_NEWDECIMAL: case MYSQL_TYPE_TIMESTAMP: - LM_DBG("use DB_INT result type"); + LM_DBG("use DB_INT result type\n"); RES_TYPES(_r)[col] = DB_INT; break; case MYSQL_TYPE_FLOAT: case MYSQL_TYPE_DOUBLE: - LM_DBG("use DB_DOUBLE result type"); + LM_DBG("use DB_DOUBLE result type\n"); RES_TYPES(_r)[col] = DB_DOUBLE; break; case MYSQL_TYPE_DATETIME: - LM_DBG("use DB_DATETIME result type"); + LM_DBG("use DB_DATETIME result type\n"); RES_TYPES(_r)[col] = DB_DATETIME; break; case MYSQL_TYPE_BLOB: - LM_DBG("use DB_BLOB result type"); + LM_DBG("use DB_BLOB result type\n"); RES_TYPES(_r)[col] = DB_BLOB; break; case FIELD_TYPE_SET: - LM_DBG("use DB_BITMAP result type"); + LM_DBG("use DB_BITMAP result type\n"); RES_TYPES(_r)[col] = DB_BITMAP; break; case MYSQL_TYPE_STRING: case MYSQL_TYPE_VAR_STRING: - LM_DBG("use DB_STRING result type"); + LM_DBG("use DB_STRING result type\n"); RES_TYPES(_r)[col] = DB_STRING; break;

15 years, 10 months

git:janakj/mysql: - fix database related doxygen errors

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: a37c75afb9470772e0e44184004b73c42aa81ac6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a37c75a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 17 13:06:28 2008 +0000 - fix database related doxygen errors git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4398 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_dbase.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index e4f78ba..410648a 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -24,7 +24,7 @@ */ /** - * \class mysql/dbase.c + * \file * \brief Implementation of core functions for the MySQL driver. * * This file contains the implementation of core functions for the MySQL @@ -237,6 +237,7 @@ int db_mysql_free_result(db_con_t* _h, db_res_t* _r) * \param _n number of key=values pairs to compare * \param _nc number of columns to return * \param _o order by the specified column + * \param _r pointer to a structure representing the result * \return zero on success, negative value on failure */ int db_mysql_query(const db_con_t* _h, const db_key_t* _k, const db_op_t* _op,

15 years, 10 months

git:janakj/mysql: - add a few more missing '\n' to debug messages

by Jan Janak

Module: sip-router Branch: janakj/mysql Commit: 24d1af2ac2835c3574ce733e7cdc1509bd3f7ae0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24d1af2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 13 12:00:36 2008 +0000 - add a few more missing '\n' to debug messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4163 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_mysql/km_res.c | 2 +- modules/db_mysql/km_row.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 7c9812b..b3e3b80 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -155,7 +155,7 @@ static inline int db_mysql_convert_rows(const db_con_t* _h, db_res_t* _r) LM_ERR("no private memory left\n"); return -2; } - LM_DBG("allocate %d bytes for rows at %p", len, RES_ROWS(_r)); + LM_DBG("allocate %d bytes for rows at %p\n", len, RES_ROWS(_r)); memset(RES_ROWS(_r), 0, len); for(row = 0; row < RES_ROW_N(_r); row++) { diff --git a/modules/db_mysql/km_row.c b/modules/db_mysql/km_row.c index c29d499..b79edb4 100644 --- a/modules/db_mysql/km_row.c +++ b/modules/db_mysql/km_row.c @@ -52,7 +52,7 @@ int db_mysql_convert_row(const db_con_t* _h, db_res_t* _res, db_row_t* _r) LM_ERR("no private memory left\n"); return -1; } - LM_DBG("allocate %d bytes for row values at %p", len, + LM_DBG("allocate %d bytes for row values at %p\n", len, ROW_VALUES(_r)); memset(ROW_VALUES(_r), 0, len); @@ -65,7 +65,7 @@ int db_mysql_convert_row(const db_con_t* _h, db_res_t* _res, db_row_t* _r) if (db_mysql_str2val(RES_TYPES(_res)[i], &(ROW_VALUES(_r)[i]), ((MYSQL_ROW)CON_ROW(_h))[i], lengths[i]) < 0) { LM_ERR("failed to convert value\n"); - LM_DBG("free row at %pn", _r); + LM_DBG("free row at %p\n", _r); db_free_row(_r); return -3; }

15 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev