[SR-Dev] git:janakj/mysql: - partial revert of commit rev5359 for db_mysql module

Jan Janak jan at iptel.org
Mon Feb 16 22:07:54 CET 2009


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

Author: Henning Westerholt <henning.westerholt at 1und1.de>
Committer: Henning Westerholt <henning.westerholt at 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);




More information about the sr-dev mailing list